diff --git a/src/main/java/net/minecraft/command/CommandBase.java b/src/main/java/net/minecraft/command/CommandBase.java index ddbb9cf..394f3ad 100644 --- a/src/main/java/net/minecraft/command/CommandBase.java +++ b/src/main/java/net/minecraft/command/CommandBase.java @@ -1,10 +1,14 @@ package net.minecraft.command; import com.google.common.primitives.Doubles; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; + +import org.ultramine.server.WorldConstants; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -13,7 +17,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; public abstract class CommandBase implements ICommand { @@ -249,7 +252,7 @@ public static double func_110666_a(ICommandSender p_110666_0_, double p_110666_1_, String p_110666_3_) { - return func_110665_a(p_110666_0_, p_110666_1_, p_110666_3_, -World.MAX_BLOCK_COORD, World.MAX_BLOCK_COORD); + return func_110665_a(p_110666_0_, p_110666_1_, p_110666_3_, -WorldConstants.MAX_BLOCK_COORD, WorldConstants.MAX_BLOCK_COORD); } public static double func_110665_a(ICommandSender p_110665_0_, double p_110665_1_, String p_110665_3_, int p_110665_4_, int p_110665_5_) diff --git a/src/main/java/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java index 028d9c4..91b396f 100644 --- a/src/main/java/net/minecraft/world/World.java +++ b/src/main/java/net/minecraft/world/World.java @@ -18,6 +18,10 @@ import org.ultramine.server.ConfigurationHandler; import org.ultramine.server.ServerLoadBalancer; +import org.ultramine.server.WorldConstants; + +import static org.ultramine.server.WorldConstants.MAX_BLOCK_COORD; + import org.ultramine.server.chunk.CallbackAddDependency; import org.ultramine.server.chunk.ChunkHash; import org.ultramine.server.chunk.ChunkProfiler; @@ -2891,15 +2895,15 @@ { for(ChunkCoordIntPair c : getPersistentChunks().keySet()) { - if(chunkRoundExists(c.chunkXPos, c.chunkZPos, 1)) + if(chunkRoundExists(c.chunkXPos, c.chunkZPos, WorldConstants.CL_LOAD_RADIUS)) { - activeChunkSet.put(ChunkHash.chunkToKey(c.chunkXPos, c.chunkZPos), (byte)100); + activeChunkSet.put(ChunkHash.chunkToKey(c.chunkXPos, c.chunkZPos), (byte)WorldConstants.CL_CHUNK_PRIOR); } else { Chunk dep = getChunkIfExists(c.chunkXPos, c.chunkZPos); if(dep != null) - ((ChunkProviderServer)chunkProvider).loadAsyncRadius(c.chunkXPos, c.chunkZPos, 1, new CallbackAddDependency(dep)); + ((ChunkProviderServer)chunkProvider).loadAsyncRadius(c.chunkXPos, c.chunkZPos, WorldConstants.CL_LOAD_RADIUS, new CallbackAddDependency(dep)); } } } @@ -4165,10 +4169,9 @@ - /* ======================================== ULTRAMINE START =====================================*/ + /*======================================== ULTRAMINE START =====================================*/ - public static final int MAX_BLOCK_COORD = 500000;//524288; private final ServerLoadBalancer balancer = new ServerLoadBalancer(this); private final WorldEventProxy eventProxy = FMLCommonHandler.instance().getSide().isServer() && this instanceof WorldServer ? new ServerWorldEventProxy((WorldServer)this) : new WorldEventProxy(); protected final WorldChunkProfiler chunkProfiler; diff --git a/src/main/java/org/ultramine/server/WorldConstants.java b/src/main/java/org/ultramine/server/WorldConstants.java new file mode 100644 index 0000000..be6d63d --- /dev/null +++ b/src/main/java/org/ultramine/server/WorldConstants.java @@ -0,0 +1,9 @@ +package org.ultramine.server; + +public class WorldConstants +{ + public static final int MAX_BLOCK_COORD = 500000; //524288; + public static final int CL_CHUNK_PRIOR = 128; + public static final int CL_LOAD_RADIUS = 1; + public static final int GENCHUNK_PRELOAD_RADIUS = 2; +} diff --git a/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java b/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java index 3aeb5e9..65c7d59 100644 --- a/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java +++ b/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java @@ -15,6 +15,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.ultramine.server.WorldConstants; import org.ultramine.server.util.BlockFace; import org.ultramine.server.util.ChunkCoordComparator; import org.ultramine.server.util.TIntArrayListImpl; @@ -387,13 +388,14 @@ chunk.setBindState(ChunkBindState.PLAYER); executor.execute(new CompressAndSendChunkTask(chunk)); } - else if(!chunk.worldObj.chunkRoundExists(chunk.xPosition, chunk.zPosition, 2)) + else if(!chunk.worldObj.chunkRoundExists(chunk.xPosition, chunk.zPosition, WorldConstants.GENCHUNK_PRELOAD_RADIUS)) { - ((WorldServer)chunk.worldObj).theChunkProviderServer.loadAsyncWithRadius(chunk.xPosition, chunk.zPosition, 2, this); + ((WorldServer)chunk.worldObj).theChunkProviderServer.loadAsyncWithRadius(chunk.xPosition, chunk.zPosition, WorldConstants.GENCHUNK_PRELOAD_RADIUS, this); } else //impossible? { - log.fatal("Chunk[{}]({}, {}) not populated when loaded {} chunk radius", chunk.worldObj.provider.dimensionId, chunk.xPosition, chunk.zPosition, 2); + log.fatal("Chunk[{}]({}, {}) not populated when loaded {} chunk radius", chunk.worldObj.provider.dimensionId, chunk.xPosition, chunk.zPosition, + WorldConstants.GENCHUNK_PRELOAD_RADIUS); sendingQueueSize.decrementAndGet(); sending.remove(key); }