diff --git a/Change Log.txt b/Change Log.txt index 3700a996..a946db49 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,6 +1,7 @@ -######## 1.0.1a ######## +######## 1.0.1-Bugfix-a ######## -fixed heart dupe bug. -AOE Mining tools now add xp from blocks directly to the player. +-tweaked some code in the config gui to try to fix an illusive cauldron related bug. ######## 1.0.1 ######## -fixed advanced dislocator index out of bounds exceptions once and for all. diff --git a/VERSION.json b/VERSION.json index 8f671b8c..09b1a545 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,3 +1,3 @@ -Version:1.0.1 +Version:1.0.1a Snapshot:0 -ReleaseNote:First "Stable" 1.0.1 Release. +ReleaseNote:Bug Fix. diff --git a/VERSION.txt b/VERSION.txt index 8f671b8c..09b1a545 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,3 @@ -Version:1.0.1 +Version:1.0.1a Snapshot:0 -ReleaseNote:First "Stable" 1.0.1 Release. +ReleaseNote:Bug Fix. diff --git a/build.gradle b/build.gradle index f9fb4540..65050770 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ repositories { apply plugin: 'forge' -version = "1.7.10-v1.0.1" //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.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) 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/render/particle/ParticleEnergyField.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java index 47ff08c8..cb2a4349 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; /** * Created by Brandon on 9/02/2015. */ -public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particle? Maby? +public class ParticleEnergyField extends EntityFX { /** * Particle Type 0 = Energy Ring, 1 = single particle */ diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java index e9d8425d..0d5e6e57 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java @@ -51,7 +51,6 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); GL11.glScalef(0.5f, 0.5f, 0.5f); - //GL11.glDisable(GL11.GL_LIGHTING); //todo disable? RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); float innerLight = 100f; 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 de0ea7ab..c87ba2b1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java @@ -30,7 +30,7 @@ public class InventoryTool implements IInventory { this.player = player; if (stack != null && stack.getItem() instanceof IInventoryTool){ this.size = ((IInventoryTool) stack.getItem()).getInventorySlots(); - readFromNBT(ItemNBTHelper.getCompound(inventoryItem)); + readFromNBT(ItemNBTHelper.getCompound(stack)); } this.inventoryStacks = new ItemStack[size + 5]; } @@ -126,10 +126,11 @@ public class InventoryTool implements IInventory { inventoryStacks[i] = null; } } - if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("markDirty " + inventoryItem + (player.worldObj.isRemote ? ":client" : ":server"))); - if (inventoryItem != null) { - writeToNBT(ItemNBTHelper.getCompound(inventoryItem)); - readFromNBT(ItemNBTHelper.getCompound(inventoryItem)); + if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("markDirty " + getItem() + (player.worldObj.isRemote ? ":client" : ":server"))); + + if (getItem() != null) { + writeToNBT(ItemNBTHelper.getCompound(getItem())); + readFromNBT(ItemNBTHelper.getCompound(getItem())); } else { LogHelper.error("[InventoryItem] storage item == null This is not a good thing..."); @@ -146,6 +147,17 @@ public class InventoryTool implements IInventory { return true; } + private ItemStack getItem(){ + if (slot != -1 && player.inventory.getStackInSlot(slot) != null && player.getHeldItem().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 +"]")); + return null; + } + } + @Override public void openInventory() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index d2c6fe8f..1751931e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -6,6 +6,7 @@ import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.utills.*; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -277,6 +278,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo { list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVActive").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVLock").readFromItem(stack, true)); + if (Loader.isModLoaded("Thaumcraft"))list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "GogglesOfRevealing").readFromItem(stack, true)); } else if (armorType == 1) { @@ -316,12 +318,12 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo @Optional.Method(modid = "Thaumcraft") @Override public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { - return true; + return ItemNBTHelper.getBoolean(itemstack, "GogglesOfRevealing", true); } @Optional.Method(modid = "Thaumcraft") @Override public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { - return true; + return ItemNBTHelper.getBoolean(itemstack, "GogglesOfRevealing", true); } } 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 0cc47c9c..c35e585f 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.1"; + public static final String VERSION = "1.0.1a"; public static final int SNAPSHOT = 0; public static final String MCVERSION = "1.7.10"; diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index cd089840..fc52f9cd 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -538,6 +538,7 @@ button.de.AxeTreeMode.name=Tree Mode button.de.BaseSafeAOE.name=AOE Safe Mode button.de.VerticalAcceleration.name=Vertical Acceleration button.de.EffectiveOnSprint.name=Effective while sprinting +button.de.GogglesOfRevealing.name=Magical Sense //Manual Gui ---------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconicAxe.png b/src/main/resources/assets/draconicevolution/textures/items/draconicAxe.png index 23d49ced..8dd67360 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconicAxe.png and b/src/main/resources/assets/draconicevolution/textures/items/draconicAxe.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconicDistructionStaff.png b/src/main/resources/assets/draconicevolution/textures/items/draconicDistructionStaff.png index 57cd4239..e1bad044 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconicDistructionStaff.png and b/src/main/resources/assets/draconicevolution/textures/items/draconicDistructionStaff.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconicPickaxe.png b/src/main/resources/assets/draconicevolution/textures/items/draconicPickaxe.png index 17e893ae..4cb40af3 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconicPickaxe.png and b/src/main/resources/assets/draconicevolution/textures/items/draconicPickaxe.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconicShovel.png b/src/main/resources/assets/draconicevolution/textures/items/draconicShovel.png index 690f6360..29d91576 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconicShovel.png and b/src/main/resources/assets/draconicevolution/textures/items/draconicShovel.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_0.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_0.png index 28c81ea0..02cba073 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_0.png and b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_0.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_1.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_1.png index 28c81ea0..02cba073 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_1.png and b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_1.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_2.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_2.png index 24b4eafe..5c8414f1 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_2.png and b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_pulling_2.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_standby.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_standby.png index 7687f21a..f712acf0 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_standby.png and b/src/main/resources/assets/draconicevolution/textures/items/draconic_bow_standby.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_hoe.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_hoe.png index 3840a4aa..718ec49e 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_hoe.png and b/src/main/resources/assets/draconicevolution/textures/items/draconic_hoe.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_pick_active.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_pick_active.png deleted file mode 100644 index 5db13bb7..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_pick_active.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_pick_obliterate.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_pick_obliterate.png deleted file mode 100644 index bb1f1c9c..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_pick_obliterate.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_shovel_active.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_shovel_active.png deleted file mode 100644 index 9b1accef..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_shovel_active.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_shovel_obliterate.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_shovel_obliterate.png deleted file mode 100644 index 7a096f19..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_shovel_obliterate.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_staff_active.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_staff_active.png deleted file mode 100644 index 32b8e9be..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_staff_active.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_staff_obliterate.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_staff_obliterate.png deleted file mode 100644 index 65fc3c2f..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_staff_obliterate.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/items/draconic_sword.png b/src/main/resources/assets/draconicevolution/textures/items/draconic_sword.png index 85616a9b..1e9147f9 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/items/draconic_sword.png and b/src/main/resources/assets/draconicevolution/textures/items/draconic_sword.png differ