From 6dd171c27a71b99de7a2fd4ca5b9469e200c746b Mon Sep 17 00:00:00 2001 From: mDiyo Date: Thu, 5 Dec 2013 00:03:01 -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 -> 1745 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 .../java/tconstruct/client/TClientEvents.java | 31 ++++++++ src/main/java/tconstruct/common/TContent.java | 6 +- src/main/java/tconstruct/common/TRepo.java | 7 +- .../java/tconstruct/items/armor/ExoArmor.java | 73 ++++++++++++++++++ .../tconstruct/library/armor/ArmorCore.java | 4 +- .../tconstruct/util/config/PHConstruct.java | 17 ++-- 14 files changed, 131 insertions(+), 12 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/main/java/tconstruct/items/armor/ExoArmor.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index ac26a3bd1b9..4d65adb2287 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-Chest +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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 literal 0 HcmV?d00001 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); diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 02917ebaefa..80ed0ff8aed 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -2,6 +2,7 @@ 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.*; @@ -583,7 +584,10 @@ void registerItems () GameRegistry.registerItem(TRepo.leggingsWood, "leggingsWood"); GameRegistry.registerItem(TRepo.bootsWood, "bootsWood"); - // essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); + TRepo.exoGoggles = new ExoArmor(PHConstruct.exoGoggles, EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles"); + TRepo.exoChest = new ExoArmor(PHConstruct.exoChest, EnumArmorPart.CHESTPLATE, "exosuit").setUnlocalizedName("tconstruct.exoChest"); + TRepo.exoPants = new ExoArmor(PHConstruct.exoPants, EnumArmorPart.LEGGINGS, "exosuit").setUnlocalizedName("tconstruct.exoPants"); + TRepo.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", diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java index a621bc21a29..d87a3d7037d 100644 --- a/src/main/java/tconstruct/common/TRepo.java +++ b/src/main/java/tconstruct/common/TRepo.java @@ -257,7 +257,12 @@ public class TRepo public static Item leggingsWood; public static Item bootsWood; public static EnumArmorMaterial materialWood; - + + //Armor - exosuit + public static Item exoGoggles; + public static Item exoChest; + public static Item exoPants; + public static Item exoShoes; public static Fluid[] fluids = new Fluid[27]; public static Block[] fluidBlocks = new Block[26]; diff --git a/src/main/java/tconstruct/items/armor/ExoArmor.java b/src/main/java/tconstruct/items/armor/ExoArmor.java new file mode 100644 index 00000000000..c9633ca5c26 --- /dev/null +++ b/src/main/java/tconstruct/items/armor/ExoArmor.java @@ -0,0 +1,73 @@ +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"); //These are temporary. Do not use them in release + 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 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/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 03ba0f05f52..7dbb487e5dd 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -19,7 +19,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerItem, 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; @@ -31,7 +31,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte public ArmorCore(int par1, int baseProtection, EnumArmorPart part) { - super(par1, EnumArmorMaterial.CHAIN, 0, 0); + super(par1, EnumArmorMaterial.CHAIN, 0, part.getPartId()); this.maxStackSize = 1; this.setMaxDamage(100); this.setUnlocalizedName(SET_NAME); diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index e38572738f7..58aec7ffa81 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -248,8 +248,10 @@ public static void initProps (File confFile) 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; @@ -406,9 +408,6 @@ public static void initProps (File confFile) public static int woodenRail; -// public static int signalBus; -// public static int signalTerminal; - //Crops public static int oreBerry; public static int oreBerrySecond; @@ -576,9 +575,11 @@ public static void initProps (File confFile) public static int knapsack; public static int heartCanister; - -// public static int spoolWire; -// public static int lengthWire; + + public static int exoGoggles; + public static int exoChest; + public static int exoPants; + public static int exoShoes; //Ore values public static boolean generateCopper;