diff --git a/Change Log.txt b/Change Log.txt index a946db49..1d609b3c 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,3 +1,6 @@ +######## 1.0.1-Bugfix-b ######## +-fixed a problem in the config gui that came from a change in bugfix a + ######## 1.0.1-Bugfix-a ######## -fixed heart dupe bug. -AOE Mining tools now add xp from blocks directly to the player. diff --git a/VERSION.json b/VERSION.json index 09b1a545..067a3681 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,3 +1,3 @@ -Version:1.0.1a +Version:1.0.1b Snapshot:0 -ReleaseNote:Bug Fix. +ReleaseNote:Bug Fix for the last Bug Fix. diff --git a/VERSION.txt b/VERSION.txt index 09b1a545..067a3681 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,3 @@ -Version:1.0.1a +Version:1.0.1b Snapshot:0 -ReleaseNote:Bug Fix. +ReleaseNote:Bug Fix for the last Bug Fix. diff --git a/build.gradle b/build.gradle index 65050770..e274df35 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ repositories { apply plugin: 'forge' -version = "1.7.10-v1.0.1a" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z) +version = "1.7.10-v1.0.1b" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z) group = "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Draconic-Evolution" diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java index d8963e43..99dc79e7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java @@ -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); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java index c87ba2b1..412d3bff 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java @@ -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; } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java index c35e585f..bd481f66 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -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";