From 384d1e0a48ffa57036782f166cd69bfbae9aa54e Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 4 Dec 2013 23:08:36 -0800 Subject: [PATCH] Exo-Armor start --- resources/assets/tinker/lang/en_US.lang | 5 + .../tinker/textures/armor/enderpearl.png | Bin 1732 -> 0 bytes .../tinker/textures/armor/exosuit_1.png | Bin 0 -> 2770 bytes .../tinker/textures/armor/exosuit_2.png | Bin 0 -> 1792 bytes .../assets/tinker/textures/armor/wood_2.png | Bin 1130 -> 1574 bytes .../textures/items/armor/exosuit_boots.png | Bin 0 -> 582 bytes .../items/armor/exosuit_chestplate.png | Bin 0 -> 586 bytes .../textures/items/armor/exosuit_helmet.png | Bin 0 -> 486 bytes .../textures/items/armor/exosuit_leggings.png | Bin 0 -> 564 bytes src/tconstruct/client/TClientEvents.java | 30 +++ src/tconstruct/common/TContent.java | 34 ++- src/tconstruct/items/armor/ExoArmor.java | 80 +++++++ src/tconstruct/items/armor/TArmorBase.java | 124 ----------- src/tconstruct/library/armor/ArmorCore.java | 200 +----------------- .../library/tools/AbilityHelper.java | 5 +- src/tconstruct/util/TEventHandler.java | 1 + src/tconstruct/util/config/PHConstruct.java | 16 +- 17 files changed, 152 insertions(+), 343 deletions(-) delete mode 100644 resources/assets/tinker/textures/armor/enderpearl.png create mode 100644 resources/assets/tinker/textures/armor/exosuit_1.png create mode 100644 resources/assets/tinker/textures/armor/exosuit_2.png create mode 100644 resources/assets/tinker/textures/items/armor/exosuit_boots.png create mode 100644 resources/assets/tinker/textures/items/armor/exosuit_chestplate.png create mode 100644 resources/assets/tinker/textures/items/armor/exosuit_helmet.png create mode 100644 resources/assets/tinker/textures/items/armor/exosuit_leggings.png create mode 100644 src/tconstruct/items/armor/ExoArmor.java delete mode 100644 src/tconstruct/items/armor/TArmorBase.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index df5ead10..562bbf64 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -257,6 +257,11 @@ item.tconstruct.chestplateWood.name=Wooden Chestplate item.tconstruct.leggingsWood.name=Wooden Leggings item.tconstruct.bootsWood.name=Wooden Boots +item.tconstruct.exoGoggles.name=Exo-Goggles +item.tconstruct.exoChest.name=Exo-Chestpiece +item.tconstruct.exoPants.name=Exo-Legs +item.tconstruct.exoShoes.name=Exo-Shoes + item.tconstruct.jerky.beef.name=Beef Jerky item.tconstruct.jerky.pig.name=Bacon Jerky item.tconstruct.jerky.chicken.name=Chicken Jerky diff --git a/resources/assets/tinker/textures/armor/enderpearl.png b/resources/assets/tinker/textures/armor/enderpearl.png deleted file mode 100644 index d1d08401e8557f4dea41c4df5a0a8862e319536d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 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 IM6N<$f*Z~ZPyhe` delta 1110 zcmV-c1gZO`4C)AwBYy-jNkl2Gno8vMg&Mhc zsb0Rl?w8ieJ#znYgM572BOSE|Wc+NUOq{QlTj#1|daTW!F@N(n-=_y8@z?R{eR6ZC zLME>?N#oJ&_V3RxPDS9qygY5BK*HBoebV1rVgxWlQsS@XvYm3ZuR?B|DL2pn1$0~0 zUW+q-b?(2q`Mmr%k{xBX|LID;20198BT!TqXwkkS$ELhOZ;_bxYi<% z2Y8ej{_h7PjeiD~_ecQzY{&%T&4imGz=<}*Xzv_>W{oO= z8nRIjX_U@rbN+(|1jL(()UwEPp6QX&z@Y#@;1T#nHtKvP}~WqDi!P&Sv?$bP>$< c`|0-o8&>yBwn}@^M*si-07*qoM6N<$f`*X{M*si- diff --git a/resources/assets/tinker/textures/items/armor/exosuit_boots.png b/resources/assets/tinker/textures/items/armor/exosuit_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..285f951437e336189e5839e6bafac7ec18a49849 GIT binary patch literal 582 zcmV-M0=fN(P) zMgKqyR76N>{3uNn8L?@;m>HQkb6muXohDWBz=3;a%@8bJ_5V2x78Q!W3|H0OOM@}Lwcfb z?fmTcFYvxIjZW{k3j^x_!Y~BDKJ>A&$!MVM1~fW7dOrk!X1CX808m(+k$ZQiB9P}V z+RV?6Q>>+w(wlv*Uzw(|cYyEvvF98C06Z;R7W>dAb6RJ&=1}?&D1ZA8F@XPxpPfwU UB*FI`m|=#qCVm;jiR0uT{6 z=QtiLuxHPoLi*>B{y8dj1zPC=3uTN(^&VdJK4vE8ViZCkiXw3Sce5l(rUsW3_&+5S zMafOTt{16QD`RJK4eNKllc@_->eI`g-^CdD6CAxJHXe_25%Xd(QgYu7(fx3jxnF%W z*M8HswTRv3ggOq`+$LUk`>m(4o!TnmIL1|MWX9TUjs7WcuwTh?ezdX0q?9=MG=i$C zPz6x6>RC??_A4~Ag6m1R9`I(6FvARCEZqj@9Gg}dso2RNVL(80O)U1lh~od4EAT(~ Y1L~2?Adv;6AOHXW07*qoM6N<$f&zQ}IRF3v literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/armor/exosuit_helmet.png b/resources/assets/tinker/textures/items/armor/exosuit_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..403190ac77525536c3bb841c7e3d94c279c9f83c GIT binary patch literal 486 zcmV@P)$vG_QNgmvl#;s&WRem9P_5OWl!DLaL%ZEZv)ROc<%O~{!^k8hIz=?c)s&J$&)~V- zI4Px|X&TP1EF=bWFf;mtJvhCnx@L}uFr{SYrc6>o2!ZSS8kAB1fW6~$_tEQ{`qG#9 zOxU&!r4;N&%fp|PF5&n4JzW(ni##11ZI5wwp4@_pyD2X2rd%8d1Q2=#ccvz0#*|_3 z{$UDR3#R~p+-3~Hkm12gD|gU^z*9e{bZ&jPGPAqoe1yyS2&YHF9?Z;0kA&gyolF1Y cFZ`*%JKP?%GTN7_N&o-=07*qoM6N<$f;;8b_5c6? literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/armor/exosuit_leggings.png b/resources/assets/tinker/textures/items/armor/exosuit_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..be402b4ed56c1bbf161a27c81fc58682ee3bb7ee GIT binary patch literal 564 zcmV-40?Yl0P)87)rnLFp6Gv{2Pl;SeWTHPG%Usp}f2B7V45Oq%h zSe^l-ndHT*ky!4HRRC|RMw&?gqV6e8&!*|wwEYeJ*xRaA7-)d7;{y=1Hu+=T6d#6` z7)`gu)!jh6d_5JT>9z=3o0VD(5O#bX?6oS$cW?VBrTFwM!?tY<HtZIN|572>?gmf72UIc;6l2I1bPD?@<(mz5{p@9TCOJx&-a5Rl2K`;;?rNz_k@C z&vhY+6B>?5mKQvIbPIqx?JEdTT5cEySzgd^Ox=AgNE-Fuk4q`}GB^Riah!`80Q8d? zVc=>B4?8!IvJBQ@u^h-#2(@$nPspm>Ki*l?E9((kYF}r($ zG&30|pD&IwK$aJJaF*TDOcDmJ9;z%aDgffL 1.0F) + { + f1 = 1.0F; + } + else + { + f1 *= f1; + } + + f *= 1.0F - f1 * 0.15F; + } + event.newfov = f; + } + /* Armor */ ModelBiped model = new ModelBiped(5f); WingModel wings = new WingModel(); diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 93473e2b..e8a21133 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2,6 +2,7 @@ package tconstruct.common; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import tconstruct.library.armor.EnumArmorPart; import tconstruct.library.crafting.ToolBuilder; import cpw.mods.fml.common.*; @@ -266,10 +267,6 @@ public class TContent implements IFuelHandler public static ModLapis modL; //Wearables - public static Item heavyHelmet; - public static Item heavyChestplate; - public static Item heavyPants; - public static Item heavyBoots; public static Item glove; public static Item knapsack; @@ -289,13 +286,12 @@ public class TContent implements IFuelHandler public static Item leggingsWood; public static Item bootsWood; public static EnumArmorMaterial materialWood; - - //Signal & Logic - public static Block signalBus; - public static Block signalTerminal; - - public static Item spoolWire; - public static Item lengthWire; + + //Armor - exosuit + public static Item exoGoggles; + public static Item exoChest; + public static Item exoPants; + public static Item exoShoes; //Temporary items //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch); @@ -961,16 +957,10 @@ public class TContent implements IFuelHandler GameRegistry.registerItem(jerky, "jerky"); //Wearables - //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); - //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); - //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); - //GameRegistry.registerItem(heavyHelmet, "heavyHelmet"); GameRegistry.registerItem(heartCanister, "heartCanister"); - //GameRegistry.registerItem(heavyBoots, "heavyBoots"); - //GameRegistry.registerItem(glove, "glove"); GameRegistry.registerItem(knapsack, "knapsack"); GameRegistry.registerItem(goldHead, "goldHead"); @@ -985,7 +975,10 @@ public class TContent implements IFuelHandler GameRegistry.registerItem(leggingsWood, "leggingsWood"); GameRegistry.registerItem(bootsWood, "bootsWood"); - // essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); + exoGoggles = new ExoArmor(PHConstruct.exoGoggles, EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles"); + exoChest = new ExoArmor(PHConstruct.exoChest, EnumArmorPart.CHESTPLATE, "exosuit").setUnlocalizedName("tconstruct.exoChest"); + exoPants = new ExoArmor(PHConstruct.exoPants, EnumArmorPart.LEGGINGS, "exosuit").setUnlocalizedName("tconstruct.exoPants"); + exoShoes = new ExoArmor(PHConstruct.exoShoes, EnumArmorPart.BOOTS, "exosuit").setUnlocalizedName("tconstruct.exoShoes"); String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", @@ -1241,6 +1234,11 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[] { "w w", "w w", 'w', "logWood" })); + //Exosuit recipes, bronze = 14 + /*exoGoggles = new ExoArmor(PHConstruct.exoGoggles, EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles"); + exoChest = new ExoArmor(PHConstruct.exoChest, EnumArmorPart.CHESTPLATE, "exosuit").setUnlocalizedName("tconstruct.exoChest"); + exoPants = new ExoArmor(PHConstruct.exoPants, EnumArmorPart.LEGGINGS, "exosuit").setUnlocalizedName("tconstruct.exoPants"); + exoShoes = new ExoArmor(PHConstruct.exoShoes, EnumArmorPart.BOOTS, "exosuit").setUnlocalizedName("tconstruct.exoShoes");*/ // Metal conversion Recipes GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 3), patBlock, '#', new ItemStack(materials, 1, 9)); // Copper GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 5), patBlock, '#', new ItemStack(materials, 1, 10)); // Tin diff --git a/src/tconstruct/items/armor/ExoArmor.java b/src/tconstruct/items/armor/ExoArmor.java new file mode 100644 index 00000000..81c5a42a --- /dev/null +++ b/src/tconstruct/items/armor/ExoArmor.java @@ -0,0 +1,80 @@ +package tconstruct.items.armor; + +import java.util.List; +import java.util.UUID; + +import com.google.common.collect.Multimap; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.*; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.EnumArmorPart; + +public class ExoArmor extends ArmorCore +{ + String textureName; + protected static final UUID speed = UUID.fromString("CB3F55A9-629C-4F38-A497-9C13A33DB5CF"); + protected static final UUID attack = UUID.fromString("CB3F55A9-629C-4F38-A497-9C13A33DB5CE"); + protected static final UUID health = UUID.fromString("CB3F55A9-629C-4F38-A497-9C13A33DB5CD"); + protected static final UUID knockback = UUID.fromString("CB3F55A9-629C-4F38-A497-9C13A33DB5CC"); + public ExoArmor(int id, EnumArmorPart part, String texture) + { + super(id, 0, part); + this.textureName = texture; + this.setCreativeTab(TConstructRegistry.materialTab); + } + + @Override + public void registerIcons (IconRegister par1IconRegister) + { + this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" + + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); + } + + @Override + public String getArmorTexture (ItemStack stack, Entity entity, int slot, int layer) + { + return "tinker:textures/armor/" + textureName + "_" + layer + ".png"; + } + + /*public Multimap getItemAttributeModifiers () + { + Multimap multimap = super.getItemAttributeModifiers(); + multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(speed, "Exosuit speed", (double) 0.5, 0)); + return multimap; + }*/ + + public void getSubItems (int par1, CreativeTabs par2CreativeTabs, List par3List) + { + ItemStack armor = new ItemStack(par1, 1, 0); + NBTTagCompound baseTag = new NBTTagCompound(); + NBTTagList list = new NBTTagList(); + + list.appendTag(getAttributeTag("generic.attackDamage", "ExoAttack", 10.0, true, knockback)); + list.appendTag(getAttributeTag("generic.movementSpeed", "ExoSpeed", 1.5, false, speed)); + list.appendTag(getAttributeTag("generic.maxHealth", "ExoHealth", 10.0, true, health)); + list.appendTag(getAttributeTag("generic.knockbackResistance", "ExoKnockback", 0.5, false, knockback)); + + baseTag.setTag("AttributeModifiers", list); + armor.setTagCompound(baseTag); + par3List.add(armor); + } + + private NBTTagCompound getAttributeTag(String attributeType, String modifierName, double amount, boolean flat, UUID uuid) + { + NBTTagCompound knockbackTag = new NBTTagCompound(); + knockbackTag.setString("AttributeName", attributeType); + knockbackTag.setString("Name", modifierName); + knockbackTag.setDouble("Amount", amount); + knockbackTag.setInteger("Operation", flat ? 0 : 1);//0 = flat increase, 1 = % increase + knockbackTag.setLong("UUIDMost", uuid.getMostSignificantBits()); + knockbackTag.setLong("UUIDLeast", uuid.getLeastSignificantBits()); + return knockbackTag; + } +} diff --git a/src/tconstruct/items/armor/TArmorBase.java b/src/tconstruct/items/armor/TArmorBase.java deleted file mode 100644 index 7a9bf99e..00000000 --- a/src/tconstruct/items/armor/TArmorBase.java +++ /dev/null @@ -1,124 +0,0 @@ -package tconstruct.items.armor; - -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumArmorMaterial; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class TArmorBase extends ItemArmor -//implements ISpecialArmor -{ - Icon[] icons; - String[] iconNames = { "wood_boots" }; - - //static Minecraft mc = Minecraft.getMinecraft(); - //private ModelBiped modelArmor; - - public TArmorBase(int id, int armorSlot) - { - super(id, EnumArmorMaterial.CLOTH, 0, armorSlot); - this.maxStackSize = 1; - this.setMaxDamage(100); - setNoRepair(); - canRepair = false; - this.setCreativeTab(CreativeTabs.tabMisc); - //this.modelArmor = new ModelBiped(0.75F); - //this.setCreativeTab(TConstructRegistry.toolTab); - } - - public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack) - { - - } - - /** - * Called by RenderBiped and RenderPlayer to determine the armor texture that - * should be use for the currently equiped item. - * This will only be called on instances of ItemArmor. - * - * Returning null from this function will use the default value. - * - * @param stack ItemStack for the equpt armor - * @param entity The entity wearing the armor - * @param slot The slot the armor is in - * @param layer The render layer, either 1 or 2, 2 is only used for CLOTH armor by default - * @return Path of texture to bind, or null to use default - */ - @Override - @SideOnly(Side.CLIENT) - public String getArmorTexture (ItemStack stack, Entity entity, int slot, int layer) - { - return "/mods/tinker/textures/armor/wood_1.png"; - } - - /** - * Override this method to have an item handle its own armor rendering. - * - * @param entityLiving The entity wearing the armor - * @param itemStack The itemStack to render the model of - * @param armorSlot 0=head, 1=torso, 2=legs, 3=feet - * - * @return A ModelBiped to render instead of the default - */ - @Override - @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel (EntityLivingBase par1EntityLiving, ItemStack itemStack, int armorSlot) - { - return null; - } - - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses () - { - return false; - } - - @SideOnly(Side.CLIENT) - @Override - public Icon getIconFromDamage (int meta) - { - return icons[0]; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons (IconRegister iconRegister) - { - this.icons = new Icon[iconNames.length]; - - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = iconRegister.registerIcon("tinker:armor/" + iconNames[i]); - } - } - - /*@Override - public ArmorProperties getProperties (EntityLiving player, ItemStack armor, DamageSource source, double damage, int slot) - { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getArmorDisplay (EntityPlayer player, ItemStack armor, int slot) - { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void damageArmor (EntityLiving entity, ItemStack stack, DamageSource source, int damage, int slot) - { - // TODO Auto-generated method stub - - }*/ -} diff --git a/src/tconstruct/library/armor/ArmorCore.java b/src/tconstruct/library/armor/ArmorCore.java index 108c174d..6f8bf87d 100644 --- a/src/tconstruct/library/armor/ArmorCore.java +++ b/src/tconstruct/library/armor/ArmorCore.java @@ -1,6 +1,5 @@ package tconstruct.library.armor; -import ic2.api.item.*; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.IBehaviorDispenseItem; import net.minecraft.entity.*; @@ -11,24 +10,18 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -/** - * NBTTags - * Main tag - InfiArmor - */ -public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem, IBoxable, ISpecialArmor +public abstract class ArmorCore extends ItemArmor implements ISpecialArmor { - - public static final String SET_NAME = "InfiArmor"; + public static final String SET_NAME = "TinkerArmor"; public final EnumArmorPart armorPart; private static final IBehaviorDispenseItem dispenserBehavior = new BehaviorDispenseArmorCopy(); public final int baseProtection; - public ArmorCore(int par1, int baseProtection, EnumArmorPart part) + public ArmorCore(int id, int baseProtection, EnumArmorPart part) { - super(par1, EnumArmorMaterial.CHAIN, 0, 0); + super(id, EnumArmorMaterial.CHAIN, 0, part.getPartId()); this.maxStackSize = 1; this.setMaxDamage(100); - this.setUnlocalizedName(SET_NAME); this.armorPart = part; this.baseProtection = baseProtection; BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserBehavior); @@ -93,170 +86,9 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem } data = tags.getCompoundTag(SET_NAME); - - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > damage) - { - charge -= damage; - tags.setInteger("charge", charge); - return; - } - else - { - damage -= charge; - tags.setInteger("charge", 0); - int dmg = data.getInteger("Damage"); - dmg += damage; - data.setInteger("Damage", dmg); - } - - } - else - { - int dmg = data.getInteger("Damage"); - dmg += damage; - data.setInteger("Damage", dmg); - } - } - - /* - * IC2 API support - */ - - @Override - public boolean canBeStoredInToolbox (ItemStack stack) - { - return true; - } - - @Override - public boolean canProvideEnergy (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - - return tags.hasKey("charge"); - } - - @Override - public int getChargedItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getEmptyItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getMaxCharge (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - return tags.hasKey("charge") ? 10000 : 0; - } - - @Override - public int getTier (ItemStack stack) - { - return 0; - } - - @Override - public int getTransferLimit (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - - return tags.hasKey("charge") ? 32 : 0; - } - - @Override - public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - { - return 0; - } - - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } - - int charge = tags.getInteger("charge"); - - if (amount > getMaxCharge(stack)) - { - amount = getMaxCharge(stack); - } - - charge += amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); - } - return amount; - } - - else - return 0; - } - - @Override - public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - { - return 0; - } - - if (amount > 0) - { - if (amount > getTransferLimit(stack)) - { - amount = getTransferLimit(stack); - } - - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - - charge -= amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); - } - - return charge; - } - - else - return 0; - } - - @Override - public boolean canUse (ItemStack stack, int amount) - { - return false; - } - - @Override - public boolean canShowChargeToolTip (ItemStack stack) - { - return false; + int dmg = data.getInteger("Damage"); + dmg += damage; + data.setInteger("Damage", dmg); } // Vanilla overrides @@ -300,15 +132,6 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem return 0; } - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - { - return this.getMaxCharge(stack); - } - } - return tags.getCompoundTag(SET_NAME).getInteger("TotalDurability"); } @@ -320,15 +143,6 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem return 0; } - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - { - return this.getMaxCharge(stack) - charge; - } - } - return tags.getCompoundTag(SET_NAME).getInteger("Damage"); } diff --git a/src/tconstruct/library/tools/AbilityHelper.java b/src/tconstruct/library/tools/AbilityHelper.java index af8390cf..5b45ab6d 100644 --- a/src/tconstruct/library/tools/AbilityHelper.java +++ b/src/tconstruct/library/tools/AbilityHelper.java @@ -12,6 +12,7 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentThorns; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityGhast; @@ -77,7 +78,9 @@ public class AbilityHelper { NBTTagCompound tags = stack.getTagCompound(); NBTTagCompound toolTags = stack.getTagCompound().getCompoundTag("InfiTool"); - int damage = toolTags.getInteger("Attack") + baseDamage; + float attribute = (float) player.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue(); + int damage = toolTags.getInteger("Attack") + baseDamage + 1; + damage *= attribute; boolean broken = toolTags.getBoolean("Broken"); int durability = tags.getCompoundTag("InfiTool").getInteger("Damage"); diff --git a/src/tconstruct/util/TEventHandler.java b/src/tconstruct/util/TEventHandler.java index 9cc61b06..2a76b4e7 100644 --- a/src/tconstruct/util/TEventHandler.java +++ b/src/tconstruct/util/TEventHandler.java @@ -234,6 +234,7 @@ public class TEventHandler @ForgeSubscribe public void onHurt (LivingHurtEvent event) { + //System.out.println("Damage: "+event.ammount); if (event.entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entityLiving; diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index a0bb621d..ac9a8158 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -265,8 +265,10 @@ public class PHConstruct goldHead = config.getItem("Patterns and Misc", "Golden Head", 14113).getInt(14113); jerky = config.getItem("Patterns and Misc", "Jerky", 14115).getInt(14115); -// spoolWire = config.getItem("Logic", "SpoolWire", 14120).getInt(14120); -// lengthWire = config.getItem("Logic", "LengthWire", 14121).getInt(14121); + exoGoggles = config.getItem("Equipables", "Exo-Goggles", 14116).getInt(14116); + exoChest = config.getItem("Equipables", "Exo-Chestpiece", 14117).getInt(14117); + exoPants = config.getItem("Equipables", "Exo-Legs", 14118).getInt(14118); + exoShoes = config.getItem("Equipables", "Exo-Boots", 14119).getInt(14119); boolean ic2 = true; boolean xycraft = true; @@ -422,9 +424,6 @@ public class PHConstruct public static int woodenRail; -// public static int signalBus; -// public static int signalTerminal; - //Crops public static int oreBerry; public static int oreBerrySecond; @@ -592,9 +591,12 @@ public class PHConstruct public static int knapsack; public static int heartCanister; + + public static int exoGoggles; + public static int exoChest; + public static int exoPants; + public static int exoShoes; -// public static int spoolWire; -// public static int lengthWire; //Ore values public static boolean generateCopper;