This commit is contained in:
brandon3055 committed 2015-05-10 23:14:56 +10:00
1 parent 5e56056999
commit 16603eae28
7 files changed
+13 -11

No files matched your search

@@ -1,7 +1,6 @@
package com.brandon3055.draconicevolution.client.keybinding;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.client.gui.GuiHandler;
import com.brandon3055.draconicevolution.common.ModItems;
import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHandler;
import com.brandon3055.draconicevolution.common.network.ButtonPacket;
@@ -30,8 +29,8 @@ public class KeyInputHandler {
if(KeyBindings.placeItem.isPressed()) handlePlaceItemKey();
if(KeyBindings.toolConfig.isPressed()) {
DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOLCONFIG, false));
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
player.openGui(DraconicEvolution.instance, GuiHandler.GUIID_TOOL_CONFIG, Minecraft.getMinecraft().theWorld, (int)player.posX, (int)player.posY, (int)player.posZ);
//EntityPlayer player = Minecraft.getMinecraft().thePlayer;
//player.openGui(DraconicEvolution.instance, GuiHandler.GUIID_TOOL_CONFIG, Minecraft.getMinecraft().theWorld, (int)player.posX, (int)player.posY, (int)player.posZ);
}
}
@@ -148,12 +148,12 @@ public class InventoryTool implements IInventory {
}
private ItemStack getItem(){
if (slot != -1 && player.inventory.getStackInSlot(slot) != null && player.getHeldItem().getItem() == inventoryItem.getItem()){
if (slot != -1 && player.inventory.getStackInSlot(slot) != null && inventoryItem != null && player.inventory.getStackInSlot(slot).getItem() == inventoryItem.getItem()){
return player.inventory.getStackInSlot(slot);
}
else {
LogHelper.error("Error getting inventory item [InventoryTool#getItem() - "+ slot +"]");
if (player.getCommandSenderName().equalsIgnoreCase("brandon3055")) player.addChatComponentMessage(new ChatComponentText("Error getting inventory item [InventoryTool#getItem() - "+ slot +"]"));
if (player.getCommandSenderName().equalsIgnoreCase("brandon3055")) player.addChatComponentMessage(new ChatComponentText("Error getting inventory item [InventoryTool#getItem() - "+ slot +"] server:" + !player.worldObj.isRemote));
return null;
}
}
@@ -5,7 +5,7 @@ package com.brandon3055.draconicevolution.common.lib;
*/
public class VersionHandler
{
public static final String VERSION = "1.0.1a";
public static final String VERSION = "1.0.1b";
public static final int SNAPSHOT = 0;
public static final String MCVERSION = "1.7.10";