From f2871763ed2ad85b0aee30139350d216dfd4de37 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 7 Feb 2014 16:50:54 -0500 Subject: [PATCH] Push my latest fixes to creative. --- src/main/java/tconstruct/common/TContent.java | 2 +- .../java/tconstruct/items/ArmorPattern.java | 3 +- src/main/java/tconstruct/items/Bowstring.java | 3 +- .../java/tconstruct/items/GoldenHead.java | 3 +- src/main/java/tconstruct/items/Pattern.java | 2 +- .../java/tconstruct/items/SpecialFood.java | 3 +- src/main/java/tconstruct/items/ToolPart.java | 3 +- src/main/java/tconstruct/items/ToolShard.java | 4 +- .../java/tconstruct/items/armor/ExoArmor.java | 3 +- .../tconstruct/library/tools/ToolCore.java | 64 ++++++++++++++----- 10 files changed, 66 insertions(+), 24 deletions(-) diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index fe8022e7980..96e4d537016 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -649,7 +649,7 @@ void registerItems () GameRegistry.registerItem(TRepo.strangeFood, "strangeFood"); GameRegistry.registerItem(TRepo.oreBerries, "oreBerries"); - boolean foodOverhaul; + boolean foodOverhaul = false; if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food")) { foodOverhaul = true; } diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java index bebaecebac4..17618d71573 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/items/ArmorPattern.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import tconstruct.library.ItemBlocklike; @@ -50,7 +51,7 @@ public void registerIcons (IIconRegister iconRegister) private static final String[] patternName = new String[] { "helmet", "chestplate", "leggings", "boots" }; - public void getSubItems (Block block, CreativeTabs tab, List list) + public void getSubItems (Item block, CreativeTabs tab, List list) { for (int i = 0; i < patternName.length; i++) { diff --git a/src/main/java/tconstruct/items/Bowstring.java b/src/main/java/tconstruct/items/Bowstring.java index a6605b8d07a..b54c0f8c6da 100644 --- a/src/main/java/tconstruct/items/Bowstring.java +++ b/src/main/java/tconstruct/items/Bowstring.java @@ -5,6 +5,7 @@ import mantle.items.abstracts.CraftingItem; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; @@ -43,7 +44,7 @@ public int getMaterialID (ItemStack stack) return stack.getItemDamage(); } - public void getSubItems (Block b, CreativeTabs tab, List list) + public void getSubItems (Item b, CreativeTabs tab, List list) { list.add(new ItemStack(b, 1, 0)); if (TRepo.thaumcraftAvailable) diff --git a/src/main/java/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/items/GoldenHead.java index 609a9ab610a..3f73cfe69bb 100644 --- a/src/main/java/tconstruct/items/GoldenHead.java +++ b/src/main/java/tconstruct/items/GoldenHead.java @@ -7,6 +7,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -60,7 +61,7 @@ protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlay /** * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) */ - public void getSubItems (Block b, CreativeTabs par2CreativeTabs, List par3List) + public void getSubItems (Item b, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(b, 1, 0)); } diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java index 81c63faa495..47f6c3e7d75 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/items/Pattern.java @@ -43,7 +43,7 @@ protected static String[] getPatternNames (String partType) "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring", "fletching", "arrowhead" }; @Override - public void getSubItems (Block b, CreativeTabs tab, List list) + public void getSubItems (Item b, CreativeTabs tab, List list) { for (int i = 1; i < patternName.length; i++) { diff --git a/src/main/java/tconstruct/items/SpecialFood.java b/src/main/java/tconstruct/items/SpecialFood.java index ab334daede5..663852fc06f 100644 --- a/src/main/java/tconstruct/items/SpecialFood.java +++ b/src/main/java/tconstruct/items/SpecialFood.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -66,7 +67,7 @@ public String getUnlocalizedName (ItemStack stack) return getUnlocalizedName() + "." + unlocalizedNames[arr]; } - public void getSubItems (Block b, CreativeTabs tab, List list) + public void getSubItems (Item b, CreativeTabs tab, List list) { for (int i = 0; i < unlocalizedNames.length; i++) list.add(new ItemStack(b, 1, i)); diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java index fa0f2cbec19..72639d64474 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -5,6 +5,7 @@ import mantle.items.abstracts.CraftingItem; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import tconstruct.common.TRepo; @@ -67,7 +68,7 @@ private static String[] buildTextureNames (String textureType) "copper", "bronze", "alumite", "steel", "blueslime", "pigiron", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; @Override - public void getSubItems (Block b, CreativeTabs tab, List list) + public void getSubItems (Item b, CreativeTabs tab, List list) { for (int i = 0; i < 19; i++) list.add(new ItemStack(b, 1, i)); diff --git a/src/main/java/tconstruct/items/ToolShard.java b/src/main/java/tconstruct/items/ToolShard.java index 5bfc382e8db..1788f36b46d 100644 --- a/src/main/java/tconstruct/items/ToolShard.java +++ b/src/main/java/tconstruct/items/ToolShard.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import tconstruct.common.TRepo; @@ -54,7 +55,8 @@ public void registerIcons (IIconRegister iconRegister) } } - public void getSubItems (Block b, CreativeTabs tab, List list) + @Override + public void getSubItems (Item b, CreativeTabs tab, List list) { for (int i = 1; i < 5; i++) list.add(new ItemStack(b, 1, i)); diff --git a/src/main/java/tconstruct/items/armor/ExoArmor.java b/src/main/java/tconstruct/items/armor/ExoArmor.java index 60b0112755d..a734a14ce54 100644 --- a/src/main/java/tconstruct/items/armor/ExoArmor.java +++ b/src/main/java/tconstruct/items/armor/ExoArmor.java @@ -8,6 +8,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -49,7 +50,7 @@ public void damageArmor (EntityLivingBase entity, ItemStack stack, DamageSource } @SideOnly(Side.CLIENT) - public void getSubItems (Block b, CreativeTabs par2CreativeTabs, List par3List) + public void getSubItems (Item b, CreativeTabs par2CreativeTabs, List par3List) { ItemStack armor = new ItemStack(b, 1, 0); NBTTagCompound baseTag = new NBTTagCompound(); diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 1623ff57012..537912fa708 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -58,7 +58,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBattlegearWeapon { - //TE power constants -- TODO grab these from the items added + //TE power constants -- TODO grab these from the protected int capacity = 400000; protected int maxReceive = 75; protected int maxExtract = 75; @@ -337,6 +337,25 @@ public void addInformation (ItemStack stack, EntityPlayer player, List list, boo return; NBTTagCompound tags = stack.getTagCompound(); + if (tags.hasKey("charge")) + { + String color = ""; + //double joules = this.getJoules(stack); + int power = tags.getInteger("charge"); + + if (power != 0) + { + if (power <= this.getMaxEnergyStored(stack) / 3) + color = "\u00a74"; + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) + color = "\u00a72"; + else + color = "\u00a76"; + } + + String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxEnergyStored(stack)).append(" EU").toString(); + list.add(charge); + } if (tags.hasKey("Energy")) { String color = ""; @@ -546,7 +565,7 @@ public void buildTool (int id, String name, List list) boolean supress = false; try { - clazz = Class.forName("tconstruct.common.TRepo"); //TODO: Make sure this is still working in 1.7. + clazz = Class.forName("tconstruct.common.TContent"); //TODO: Make sure this is still working in 1.7. fld = clazz.getField("supressMissingToolLogs"); supress = fld.getBoolean(fld); } @@ -821,6 +840,7 @@ public int getItemMaxDamageFromStack (ItemStack stack) { return 0; } + if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); @@ -837,6 +857,7 @@ public int getItemDamageFromStackForDisplay (ItemStack stack) { return 0; } + if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); @@ -847,30 +868,44 @@ public int getItemDamageFromStackForDisplay (ItemStack stack) } /* Battlegear support, IBattlegearWeapon */ - - @Override - public boolean willAllowOffhandWeapon () + // 1.6.4 start + public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) { return true; } - @Override - public boolean willAllowShield () + public boolean isOffhandHandDual(ItemStack off) { return true; } - @Override - public boolean isOffhandHandDualWeapon () + public boolean sheatheOnBack(ItemStack item) { - return true; + return false; + } + //1.6.4 end + + //1.6.2 start + public boolean willAllowOffhandWeapon() + { + return true; } - @Override - public boolean sheatheOnBack () + public boolean willAllowShield() { - return false; + return true; + } + + public boolean isOffhandHandDualWeapon() + { + return true; } + + public boolean sheatheOnBack() + { + return false; + } + //1.6.2 end @Override public boolean offhandAttackEntity (OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) @@ -884,7 +919,7 @@ public boolean offhandClickAir (PlayerInteractEvent event, ItemStack mainhandIte return true; } - @Override + @Override public boolean offhandClickBlock (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) { return true; @@ -961,7 +996,6 @@ public int getEnergyStored (ItemStack container) } return tags.getInteger("Energy"); } - @Override public int getMaxEnergyStored (ItemStack container) {