Fixed dimension lookup

Version bump

mcp/mobius/waila/ProxyClient.java

@@ -21,10 +21,11 @@ import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla;
 import mcp.mobius.waila.gui.ConfigKeyHandler;
 import mcp.mobius.waila.handlers.HUDHandlerExternal;
 import mcp.mobius.waila.handlers.HUDHandlerWaila;
+import mcp.mobius.waila.handlers.HandlerEnchantment;
 import mcp.mobius.waila.handlers.SummaryProviderDefault;
-import mcp.mobius.waila.handlers.TechTreeHandler;
+import mcp.mobius.waila.handlers.HandlerTechTree;
 import mcp.mobius.waila.handlers.TooltipHandlerWaila;
-import mcp.mobius.waila.handlers.WikiHandler;
+import mcp.mobius.waila.handlers.HandlerWiki;
 import mcp.mobius.waila.server.ProxyServer;
 
 public class ProxyClient extends ProxyServer {
@@ -41,13 +42,15 @@ public class ProxyClient extends ProxyServer {
 		API.registerHighlightHandler(new HUDHandlerWaila(),    ItemInfo.Layout.HEADER);		
 		
 		KeyBindingRegistry.registerKeyBinding(new ConfigKeyHandler());
+
+		ExternalModulesHandler.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class);		
 		
-		//GuiContainerManager.addInputHandler(new TechTreeHandler());
-		//API.addKeyBind(Constants.BIND_ENCH, "Display enchantements", Keyboard.KEY_RSHIFT);
-		//API.addKeyBind(Constants.BIND_WIKI, "Display wiki",          Keyboard.KEY_RSHIFT);
-		//API.addKeyBind(Constants.BIND_TECH, "Display techtree",      Keyboard.KEY_RSHIFT);
-		
-		ExternalModulesHandler.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class);
+		//GuiContainerManager.addInputHandler(new HandlerEnchantment());		
+		//GuiContainerManager.addInputHandler(new HandlerWiki());		
+		//GuiContainerManager.addInputHandler(new HandlerTechTree());
+		//API.addKeyBind(Constants.BIND_SCREEN_ENCH, "Display enchantements", Keyboard.KEY_NUMPAD7);
+		//API.addKeyBind(Constants.BIND_SCREEN_WIKI, "Display wiki",          Keyboard.KEY_NUMPAD8);
+		//API.addKeyBind(Constants.BIND_SCREEN_TECH, "Display techtree",      Keyboard.KEY_NUMPAD9);
 		
 		this.registerMods();		
 	}	

mcp/mobius/waila/handlers/HandlerEnchantment.java

@@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.forge.IContainerInputHandler;
 
-public class EnchantmentHandler implements IContainerInputHandler {
+public class HandlerEnchantment implements IContainerInputHandler {
 
     static Class EplusApi;
     static Method Tooltip;	

mcp/mobius/waila/handlers/HandlerTechTree.java

@@ -22,24 +22,9 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.forge.IContainerInputHandler;
 
-public class TechTreeHandler implements IContainerInputHandler {
-
-	public TechTreeHandler() {
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-		// TODO Auto-generated method stub
-
-	}
+public class HandlerTechTree implements IContainerInputHandler {
 
+	public HandlerTechTree() {}
 
 	@Override
 	public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
@@ -54,42 +39,6 @@ public class TechTreeHandler implements IContainerInputHandler {
 			LinkedHashMap<Integer, ArrayList<CraftingTreeNode>> layers = new LinkedHashMap<Integer, ArrayList<CraftingTreeNode>> (); 
 			CraftingTreeNode tree = new CraftingTreeNode(null, stackover, 0, layers);
 
-			/*
-			LinkedHashMap<Integer, ArrayList<CraftingTreeNode>> curratedLayers = new LinkedHashMap<Integer, ArrayList<CraftingTreeNode>> (); 
-
-			for (int layer : layers.keySet())
-				curratedLayers.put(layer, new ArrayList<CraftingTreeNode>());
-			
-			for (int i = 0; i < (layers.size() - 1) ; i++)
-				for (CraftingTreeNode node : layers.get(i)){
-					if (node.bottomNodes.size() != 0){
-						curratedLayers.get(i).add(node);
-
-					}
-					else{
-						node.layer += 1;
-						layers.get(i+1).add(node);
-					}
-				}
-
-			for (CraftingTreeNode node : layers.get(layers.keySet().size()-1))
-				curratedLayers.get(layers.keySet().size()-1).add(node);
-				
-			System.out.printf("%s\n", curratedLayers);
-			*/
-			
-			/*
-			for (int layer = curratedLayers.keySet().size() - 1; layer >= 0; layer--){
-				int offsetX = 0;
-				for (int icompo = 0; icompo < curratedLayers.get(layer).size(); icompo++){
-					ComponentDisplay componentDisplay = new ComponentDisplay(techScreen, curratedLayers.get(layer).get(icompo));
-					componentDisplay.setBackgroundColor(0xddeeeed1);
-					techScreen.widViewport.addWidget(componentDisplay, offsetX, layer*32, 0);
-					offsetX += componentDisplay.getWidth() + 8;
-				}
-			}
-			*/
-
 			for (int layer = layers.keySet().size() - 1; layer >= 0; layer--){
 				int offsetX = 0;
 				for (int icompo = 0; icompo < layers.get(layer).size(); icompo++){
@@ -107,46 +56,22 @@ public class TechTreeHandler implements IContainerInputHandler {
 		}
 		return false;
 	}
-
+	
 	@Override
-	public boolean mouseClicked(GuiContainer gui, int mousex, int mousey,
-			int button) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
+	public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {	return false; }
 	@Override
-	public void onMouseClicked(GuiContainer gui, int mousex, int mousey,
-			int button) {
-		// TODO Auto-generated method stub
-
-	}
-
+	public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {	}
 	@Override
-	public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
-		// TODO Auto-generated method stub
-
-	}
-
+	public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {	return false; }
 	@Override
-	public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey,
-			int scrolled) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
+	public void onMouseClicked(GuiContainer gui, int mousex, int mousey,  int button) {	}
 	@Override
-	public void onMouseScrolled(GuiContainer gui, int mousex, int mousey,
-			int scrolled) {
-		// TODO Auto-generated method stub
-
-	}
-
+	public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) { }
 	@Override
-	public void onMouseDragged(GuiContainer gui, int mousex, int mousey,
-			int button, long heldTime) {
-		// TODO Auto-generated method stub
-
-	}
+	public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { return false; }
+	@Override
+	public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { }
+	@Override
+	public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) { }
 
 }

mcp/mobius/waila/handlers/HandlerWiki.java

@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.forge.IContainerInputHandler;
 
-public class WikiHandler implements IContainerInputHandler {
+public class HandlerWiki implements IContainerInputHandler {
 
 	public String getDescriptionString(String modid, String name, String meta){
 		if (ExternalModulesHandler.instance().hasDocTextModID(modid)){
@@ -82,56 +82,20 @@ public class WikiHandler implements IContainerInputHandler {
 	}
 
 	@Override
-	public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
+	public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {	return false; }
 	@Override
-	public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-		// TODO Auto-generated method stub
-
-	}	
-	
+	public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {	}
 	@Override
-	public boolean mouseClicked(GuiContainer gui, int mousex, int mousey,
-			int button) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
+	public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {	return false; }
 	@Override
-	public void onMouseClicked(GuiContainer gui, int mousex, int mousey,
-			int button) {
-		// TODO Auto-generated method stub
-
-	}
-
+	public void onMouseClicked(GuiContainer gui, int mousex, int mousey,  int button) {	}
 	@Override
-	public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
-		// TODO Auto-generated method stub
-
-	}
-
+	public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) { }
 	@Override
-	public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey,
-			int scrolled) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
+	public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { return false; }
 	@Override
-	public void onMouseScrolled(GuiContainer gui, int mousex, int mousey,
-			int scrolled) {
-		// TODO Auto-generated method stub
-
-	}
-
+	public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { }
 	@Override
-	public void onMouseDragged(GuiContainer gui, int mousex, int mousey,
-			int button, long heldTime) {
-		// TODO Auto-generated method stub
-
-	}
+	public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) { }
 
 }

mcp/mobius/waila/mod_Waila.java

@@ -33,8 +33,9 @@ import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.registry.GameData;
 import cpw.mods.fml.common.registry.ItemData;
 
-@Mod(modid="Waila", name="Waila", version="1.3.7_dev")
-@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class)
+@Mod(modid="Waila", name="Waila", version="1.3.9")
+@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, 
+			connectionHandler = WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class, versionBounds="[1.3.0,)")
 
 public class mod_Waila {
     // The instance of your mod that Forge uses.

mcp/mobius/waila/network/WailaPacketHandler.java

@@ -12,6 +12,7 @@ import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.DimensionManager;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.PacketDispatcher;
@@ -30,7 +31,8 @@ public class WailaPacketHandler implements IPacketHandler {
 			else if (header == 0x01){
 				Packet0x01TERequest castedPacket = new Packet0x01TERequest(packet);
 		        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-		        TileEntity      entity = server.worldServers[castedPacket.worldID].getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ);
+		        TileEntity      entity = DimensionManager.getWorld(castedPacket.worldID).getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ);
+		        //TileEntity      entity = server.worldServers[castedPacket.worldID].getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ);
 		        if (entity != null){
 		        	try{
 		        		NBTTagCompound tag = new NBTTagCompound();