From 3c7ae149edc1b929717ebdbcca4ab6a5b20762cf Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Wed, 15 Apr 2015 02:56:23 -0500 Subject: Added new patterns --- src/main/java/gmail/Lance5057/TinkersDefense.java | 49 ++++++++++++---------- .../java/gmail/Lance5057/items/TD_Patterns.java | 3 +- 2 files changed, 29 insertions(+), 23 deletions(-) (limited to 'src/main/java/gmail') diff --git a/src/main/java/gmail/Lance5057/TinkersDefense.java b/src/main/java/gmail/Lance5057/TinkersDefense.java index 49b947a..7ca5f92 100644 --- a/src/main/java/gmail/Lance5057/TinkersDefense.java +++ b/src/main/java/gmail/Lance5057/TinkersDefense.java @@ -116,12 +116,12 @@ public static Item item_thread; public static Item item_glowthread; public static Item item_cloth; -public static Item rivets; -public static Item clasp; - public static Pattern woodPattern; public static Pattern metalPattern; +public static DynamicToolPart partRivet; +public static DynamicToolPart partArmorplate; + @SidedProxy(clientSide = "gmail.Lance5057.proxy.ClientProxy", serverSide = "gmail.Lance5057.proxy.CommonProxy") public static CommonProxy proxy; @@ -288,25 +288,14 @@ public void preInit(FMLPreInitializationEvent e) woodPattern = new TD_Patterns("pattern_", "Pattern"); metalPattern = new TD_Patterns("cast_", "MetalPattern"); - GameRegistry.registerItem(woodPattern, "woodPattern"); - TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); - - rivets = new DynamicToolPart("_rivets", "rivets"); + GameRegistry.registerItem(woodPattern, "Pattern"); + //TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); - clasp = new DynamicToolPart("_clasp", "clasp"); - - GameRegistry.registerItem(rivets, "rivets"); - TConstructRegistry.addItemToDirectory("rivets",rivets); - - GameRegistry.registerItem(clasp, "clasp"); - TConstructRegistry.addItemToDirectory("clasp",clasp); + GameRegistry.registerItem(metalPattern, "Cast"); TConstructRegistry.addItemStackToDirectory("rivets Pattern", new ItemStack(woodPattern, 1, 0)); TConstructRegistry.addItemStackToDirectory("clasp Pattern", new ItemStack(woodPattern, 1, 1)); - - //ItemStack metalCast = new ItemStack(patternOutputs[i], 1, liquidDamage[iterTwo]); - tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); - Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, 1000); + TConstructRegistry.addItemStackToDirectory("armorplate Pattern", new ItemStack(woodPattern, 1, 2)); //Renderers proxy.registerRenderers(); @@ -393,11 +382,20 @@ public void init(FMLInitializationEvent e) StencilBuilder.registerStencil(50, woodPattern, 0); // rivets StencilBuilder.registerStencil(51, woodPattern, 1); // spike + StencilBuilder.registerStencil(52, woodPattern, 2); // armorplate PatternBuilder.instance.addToolPattern(woodPattern); + + + partRivet = new DynamicToolPart("_rivets", "Rivets"); + GameRegistry.registerItem(partRivet, "RivetPart"); + + partArmorplate = new DynamicToolPart("_armorplate", "Armor Plate"); + GameRegistry.registerItem(partArmorplate, "ArmorPlatePart"); - buildParts(rivets, 0); - buildParts(clasp, 1); + buildParts(partRivet, 0); + //buildParts(clasp, 1); + buildParts(partArmorplate, 2); } @@ -451,11 +449,18 @@ public void buildParts(Item item, int meta) } LiquidCasting tableCasting = TConstructRegistry.getTableCasting(); + //patternOutputs = new Item[] { partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb }; + + ItemStack cast = new ItemStack(metalPattern, 1, meta); + + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(item, 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(item, 1, Short.MAX_VALUE), false, 50); - for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { + for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) + { Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); int fluidAmount = metalPattern.getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; - ItemStack metalCast = new ItemStack(patternOutputs[i], 1, liquidDamage[iterTwo]); + ItemStack metalCast = new ItemStack(item, 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); } diff --git a/src/main/java/gmail/Lance5057/items/TD_Patterns.java b/src/main/java/gmail/Lance5057/items/TD_Patterns.java index ba31190..af47c59 100644 --- a/src/main/java/gmail/Lance5057/items/TD_Patterns.java +++ b/src/main/java/gmail/Lance5057/items/TD_Patterns.java @@ -9,7 +9,7 @@ import tconstruct.tools.items.Pattern; import tconstruct.util.Reference; public class TD_Patterns extends Pattern { - private static final String[] patternName = new String[] {"rivets","clasp"}; + private static final String[] patternName = new String[] {"rivets","clasp","armorplate"}; public TD_Patterns(String patternType, String name) { super(patternName, getPatternNames(patternName, patternType), "patterns/"); @@ -41,6 +41,7 @@ public class TD_Patterns extends Pattern { { case 0: return 1; //rivets case 1: return 2; //clasp + case 2: return 8; //armorplate } return 0; } -- cgit v1.2.3