diff --git a/common/net/minecraftforge/common/DimensionManager.java b/common/net/minecraftforge/common/DimensionManager.java index 504139352f..527ab09367 100644 --- a/common/net/minecraftforge/common/DimensionManager.java +++ b/common/net/minecraftforge/common/DimensionManager.java @@ -15,6 +15,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.server.MinecraftServer; import net.minecraft.src.*; +import net.minecraftforge.event.world.WorldEvent; public class DimensionManager { @@ -23,7 +24,9 @@ public class DimensionManager private static Hashtable worlds = new Hashtable(); private static boolean hasInit = false; private static Hashtable dimensions = new Hashtable(); - private static Map> persistentChunkStore = Maps.newHashMap(); + private static Map> persistentChunkStore = Maps.newHashMap(); //FIXME: Unused? + private static ArrayList unloadQueue = new ArrayList(); + private static int nextFree; public static boolean registerProviderType(int id, Class provider, boolean keepLoaded) { @@ -42,6 +45,7 @@ public class DimensionManager { return; } + nextFree = 0; //FIXME: Load/store nextFree from/in file in world dir, since other dims could have been registered in previous sessions by a now uninstalled mod registerProviderType( 0, WorldProviderSurface.class, true); registerProviderType(-1, WorldProviderHell.class, true); registerProviderType( 1, WorldProviderEnd.class, false); @@ -54,13 +58,27 @@ public class DimensionManager { if (!providers.containsKey(providerType)) { - throw new IllegalArgumentException(String.format("Failed to register dimensiuon for id %d, provider type %d does not exist", id, providerType)); + throw new IllegalArgumentException(String.format("Failed to register dimension for id %d, provider type %d does not exist", id, providerType)); } if (dimensions.containsKey(id)) { - throw new IllegalArgumentException(String.format("Failed to register dimensiuon for id %d, One is already registered", id)); + throw new IllegalArgumentException(String.format("Failed to register dimension for id %d, One is already registered", id)); } dimensions.put(id, providerType); + if (id >= nextFree) + nextFree = id+1; + } + + /** + * For unregistering a dimension when the save is changed (disconnected from a server or loaded a new save + */ + public static void unregisterDimension(int id) + { + if (!dimensions.containsKey(id)) + { + throw new IllegalArgumentException(String.format("Failed to unregister dimension for id %d; No provider registered", id)); + } + dimensions.remove(id); } public static int getProviderType(int dim) @@ -79,17 +97,26 @@ public class DimensionManager public static Integer[] getIDs() { - return dimensions.keySet().toArray(new Integer[0]); + return worlds.keySet().toArray(new Integer[worlds.size()]); //Only loaded dims, since usually used to cycle through loaded worlds } public static void setWorld(int id, WorldServer world) { - worlds.put(id, world); + if (world != null) { + worlds.put(id, world); + MinecraftServer.getServer().worldTickTimes.put(id, new long[100]); + } else { + worlds.remove(id); + MinecraftServer.getServer().worldTickTimes.remove(id); + } ArrayList tmp = new ArrayList(); - tmp.add(worlds.get( 0)); - tmp.add(worlds.get(-1)); - tmp.add(worlds.get( 1)); + if (worlds.get( 0) != null) + tmp.add(worlds.get( 0)); + if (worlds.get(-1) != null) + tmp.add(worlds.get(-1)); + if (worlds.get( 1) != null) + tmp.add(worlds.get( 1)); for (Entry entry : worlds.entrySet()) { @@ -102,7 +129,32 @@ public class DimensionManager } MinecraftServer.getServer().worldServers = tmp.toArray(new WorldServer[0]); - MinecraftServer.getServer().worldTickTimes.put(id, new long[100]); + } + + public static void initDimension(int dim) { + WorldServer overworld = getWorld(0); + if (overworld == null) { + throw new RuntimeException("Cannot Hotload Dim: Overworld is not Loaded!"); + } + try { + DimensionManager.getProviderType(dim); + } catch (Exception e) { + System.err.println("Cannot Hotload Dim: " + e.getMessage()); + return; //If a provider hasn't been registered then we can't hotload the dim + } + MinecraftServer mcServer = overworld.getMinecraftServer(); + ISaveHandler savehandler = overworld.getSaveHandler(); + WorldSettings worldSettings = new WorldSettings(overworld.getWorldInfo()); + + WorldServer world = (dim == 0 ? overworld : new WorldServerMulti(mcServer, savehandler, overworld.getWorldInfo().getWorldName(), dim, worldSettings, overworld, mcServer.theProfiler)); + MinecraftForge.EVENT_BUS.post(new WorldEvent.Load(world)); + world.addWorldAccess(new WorldManager(mcServer, world)); + if (!mcServer.isSinglePlayer()) + { + world.getWorldInfo().setGameType(mcServer.getGameType()); + } + + mcServer.setDifficultyForAllWorlds(mcServer.getDifficulty()); } public static WorldServer getWorld(int id) @@ -138,7 +190,7 @@ public class DimensionManager } else { - return null; + throw new RuntimeException(String.format("No WorldProvider bound for dimension %d", dim)); //It's going to crash anyway at this point. Might as well be informative } } catch (Exception e) @@ -148,4 +200,29 @@ public class DimensionManager throw new RuntimeException(e); } } + + public static void unloadWorld(int id) { + unloadQueue.add(id); + } + + /* + * To be called by the server at the appropriate time, do not call from mod code. + */ + public static void unloadWorlds(Hashtable worldTickTimes) { + for (int id : unloadQueue) { + try { + worlds.get(id).saveAllChunks(true, null); + } catch (MinecraftException e) { + e.printStackTrace(); + } + MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(worlds.get(id))); + ((WorldServer)worlds.get(id)).flush(); + setWorld(id, null); + } + unloadQueue.clear(); + } + + public static int getNextFreeDimId() { + return nextFree; + } }