diff --git a/src/main/java/org/ultramine/server/world/WorldDescriptor.java b/src/main/java/org/ultramine/server/world/WorldDescriptor.java index f9bee88..8de8a4b 100644 --- a/src/main/java/org/ultramine/server/world/WorldDescriptor.java +++ b/src/main/java/org/ultramine/server/world/WorldDescriptor.java @@ -24,16 +24,13 @@ import org.apache.logging.log4j.Logger; import org.ultramine.server.Teleporter; import org.ultramine.server.WorldsConfig.WorldConfig; -import org.ultramine.server.WorldsConfig.WorldConfig.MobSpawn.MobSpawnEngine; -import org.ultramine.server.WorldsConfig.WorldConfig.Settings.WorldTime; -import org.ultramine.server.util.BasicTypeParser; import org.ultramine.server.util.GlobalExecutors; import org.ultramine.server.util.WarpLocation; import org.ultramine.server.world.load.IWorldLoader; import org.ultramine.server.world.load.ImportWorldLoader; import org.ultramine.server.world.load.OverworldLoader; -import org.ultramine.server.world.load.SplitedWorldLoader; -import org.ultramine.server.world.load.UnsplitedWorldLoader; +import org.ultramine.server.world.load.SplittedWorldLoader; +import org.ultramine.server.world.load.NotSplittedWorldLoader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -212,8 +209,8 @@ } if(!splitWorldDirs) - return new UnsplitedWorldLoader(this, server); - return new SplitedWorldLoader(this, server); + return new NotSplittedWorldLoader(this, server); + return new SplittedWorldLoader(this, server); } @SideOnly(Side.SERVER) diff --git a/src/main/java/org/ultramine/server/world/load/ImportWorldLoader.java b/src/main/java/org/ultramine/server/world/load/ImportWorldLoader.java index 440f391..cf86d75 100644 --- a/src/main/java/org/ultramine/server/world/load/ImportWorldLoader.java +++ b/src/main/java/org/ultramine/server/world/load/ImportWorldLoader.java @@ -11,7 +11,7 @@ import net.minecraft.server.MinecraftServer; -public class ImportWorldLoader extends SplitedWorldLoader +public class ImportWorldLoader extends SplittedWorldLoader { private ImportSaveHandler saveHandler; diff --git a/src/main/java/org/ultramine/server/world/load/NotSplittedWorldLoader.java b/src/main/java/org/ultramine/server/world/load/NotSplittedWorldLoader.java new file mode 100644 index 0000000..069e96c --- /dev/null +++ b/src/main/java/org/ultramine/server/world/load/NotSplittedWorldLoader.java @@ -0,0 +1,34 @@ +package org.ultramine.server.world.load; + +import org.ultramine.server.world.WorldDescriptor; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; +import net.minecraft.world.WorldServerMulti; +import net.minecraft.world.storage.ISaveHandler; +import net.minecraft.world.storage.WorldInfo; + +public class NotSplittedWorldLoader extends AbstractWorldLoader +{ + public NotSplittedWorldLoader(WorldDescriptor desc, MinecraftServer server) + { + super(desc, server); + } + + @Override + public WorldServer doLoad() + { + WorldServer mainWorld = server.getMultiWorld().getWorldByID(0); + ISaveHandler mainSaveHandler = mainWorld.getSaveHandler(); + WorldInfo mainWorldInfo = mainWorld.getWorldInfo(); + return new WorldServerMulti( + server, + mainSaveHandler, + mainWorldInfo.getWorldName(), + desc.getDimension(), + makeSettings(mainWorldInfo, desc.getConfig()), + mainWorld, + server.theProfiler + ); + } +} diff --git a/src/main/java/org/ultramine/server/world/load/SplitedWorldLoader.java b/src/main/java/org/ultramine/server/world/load/SplitedWorldLoader.java deleted file mode 100644 index d26fea4..0000000 --- a/src/main/java/org/ultramine/server/world/load/SplitedWorldLoader.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ultramine.server.world.load; - -import org.ultramine.server.world.WorldDescriptor; - -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.WorldServer; -import net.minecraft.world.chunk.storage.AnvilSaveHandler; -import net.minecraft.world.storage.ISaveHandler; - -public class SplitedWorldLoader extends AbstractWorldLoader -{ - public SplitedWorldLoader(WorldDescriptor desc, MinecraftServer server) - { - super(desc, server); - } - - @Override - public WorldServer doLoad() - { - ISaveHandler save = getSaveHandler(); - ((AnvilSaveHandler)save).setSingleStorage(); - return new WorldServer(server, save, desc.getName(), desc.getDimension(), makeSettings(save.loadWorldInfo(), desc.getConfig()), server.theProfiler); - } - - protected ISaveHandler getSaveHandler() - { - return server.getActiveAnvilConverter().getSaveLoader(desc.getName(), false); - } -} diff --git a/src/main/java/org/ultramine/server/world/load/SplittedWorldLoader.java b/src/main/java/org/ultramine/server/world/load/SplittedWorldLoader.java new file mode 100644 index 0000000..4bb6874 --- /dev/null +++ b/src/main/java/org/ultramine/server/world/load/SplittedWorldLoader.java @@ -0,0 +1,29 @@ +package org.ultramine.server.world.load; + +import org.ultramine.server.world.WorldDescriptor; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.WorldServer; +import net.minecraft.world.chunk.storage.AnvilSaveHandler; +import net.minecraft.world.storage.ISaveHandler; + +public class SplittedWorldLoader extends AbstractWorldLoader +{ + public SplittedWorldLoader(WorldDescriptor desc, MinecraftServer server) + { + super(desc, server); + } + + @Override + public WorldServer doLoad() + { + ISaveHandler save = getSaveHandler(); + ((AnvilSaveHandler)save).setSingleStorage(); + return new WorldServer(server, save, desc.getName(), desc.getDimension(), makeSettings(save.loadWorldInfo(), desc.getConfig()), server.theProfiler); + } + + protected ISaveHandler getSaveHandler() + { + return server.getActiveAnvilConverter().getSaveLoader(desc.getName(), false); + } +} diff --git a/src/main/java/org/ultramine/server/world/load/UnsplitedWorldLoader.java b/src/main/java/org/ultramine/server/world/load/UnsplitedWorldLoader.java deleted file mode 100644 index 3dac00d..0000000 --- a/src/main/java/org/ultramine/server/world/load/UnsplitedWorldLoader.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ultramine.server.world.load; - -import org.ultramine.server.world.WorldDescriptor; - -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.WorldServer; -import net.minecraft.world.WorldServerMulti; -import net.minecraft.world.storage.ISaveHandler; -import net.minecraft.world.storage.WorldInfo; - -public class UnsplitedWorldLoader extends AbstractWorldLoader -{ - public UnsplitedWorldLoader(WorldDescriptor desc, MinecraftServer server) - { - super(desc, server); - } - - @Override - public WorldServer doLoad() - { - WorldServer mainWorld = server.getMultiWorld().getWorldByID(0); - ISaveHandler mainSaveHandler = mainWorld.getSaveHandler(); - WorldInfo mainWorldInfo = mainWorld.getWorldInfo(); - return new WorldServerMulti( - server, - mainSaveHandler, - mainWorldInfo.getWorldName(), - desc.getDimension(), - makeSettings(mainWorldInfo, desc.getConfig()), - mainWorld, - server.theProfiler - ); - } -}