Balance Additions (#53)

-Added Clay Patterns:
Single use patterns for smeltery that supports only tools not requiring a tool forge.
Currently unobtainable since I'll leave that to modpack creators.

-Added Molten Quartz:
A useful material for gating stuff behind the nether.
Just melt quartz or quartz block.

src/main/java/tconstruct/library/TConstructRegistry.java

@@ -39,7 +39,7 @@ public class TConstructRegistry
      * cutlass frypan, battlesign, mattock, chisel lumberaxe, cleaver, scythe,
      * excavator, hammer, battleaxe
      * 
-     * Patterns: blankPattern, woodPattern, metalPattern
+     * Patterns: blankPattern, woodPattern, metalPattern, clayPattern
      * 
      * Tool crafting parts: toolRod, toolShard, binding, toughBinding, toughRod,
      * heavyPlate pickaxeHead, shovelhead, hatchetHead, swordBlade, wideguard,

src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java

@@ -18,6 +18,7 @@ public void init (FMLInitializationEvent event)
                 moltenGoldFluid,
                 moltenSteelFluid,
                 moltenEmeraldFluid,
+                moltenQuartzFluid,
                 moltenArditeFluid,
                 moltenCobaltFluid,
                 // all alloys

src/main/java/tconstruct/plugins/imc/TinkerRfTools.java

@@ -25,6 +25,7 @@ public void preInit(FMLPreInitializationEvent event) {
         configure(moltenTinFluid, 9000, 6000, 500, 4);
         configure(moltenIronFluid, 10000, 7500, 1000, 5);
         configure(moltenSteelFluid, 25000, 12500, 2000, 6);
+        configure(moltenQuartzFluid, 25000, 12500, 2000, 6);
         configure(moltenGoldFluid, 50000, 15000, 2500, 6);
 
         // precious fluids
@@ -39,8 +40,8 @@ public void preInit(FMLPreInitializationEvent event) {
         configure(moltenSilverFluid, 45678, 14321, 1234, 6);
 
         // configure availability
-        preventLoot(moltenSteelFluid, moltenGoldFluid, moltenEnderFluid, moltenArditeFluid, moltenCobaltFluid, moltenSilverFluid, moltenEmeraldFluid);
-        preventGen(moltenCobaltFluid, moltenArditeFluid, moltenSteelFluid, moltenGoldFluid, moltenEmeraldFluid, moltenIronFluid);
+        preventLoot(moltenSteelFluid, moltenGoldFluid, moltenEnderFluid, moltenArditeFluid, moltenCobaltFluid, moltenSilverFluid, moltenEmeraldFluid, moltenQuartzFluid);
+        preventGen(moltenCobaltFluid, moltenArditeFluid, moltenSteelFluid, moltenGoldFluid, moltenEmeraldFluid, moltenIronFluid, moltenQuartzFluid);
 
         // configure ores
         if(TinkerWorld.oreSlag != null) {

src/main/java/tconstruct/smeltery/SmelteryProxyClient.java

@@ -74,6 +74,7 @@ void registerManualIcons ()
         MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TinkerSmeltery.buckets, 1, 25));
         MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TinkerSmeltery.buckets, 1, 24));
         MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TinkerSmeltery.buckets, 1, 23));
+        MantleClientRegistry.registerManualIcon("quartzbucket", new ItemStack(TinkerSmeltery.buckets, 1, 26));
 
         MProxyClient.registerManualPage("blockcast", BlockCastPage.class);
     }

src/main/java/tconstruct/smeltery/gui/SmelteryGui.java

@@ -370,6 +370,10 @@ public List getLiquidTooltip (FluidStack liquid, boolean advanced, boolean fuel)
             {
                 list.add(StatCollector.translateToLocal("gui.smeltery.emerald") + liquid.amount / 640f);
             }
+            else if (name.equals(StatCollector.translateToLocal("fluid.quartz.molten")))
+            {
+                list.add(StatCollector.translateToLocal("gui.smeltery.quartz") + liquid.amount / 250f);
+            }
             else if (name.equals(StatCollector.translateToLocal("fluid.glass.molten")))
             {
                 int blocks = liquid.amount / 1000;

src/main/java/tconstruct/smeltery/items/ClayPattern.java

@@ -0,0 +1,36 @@
+package tconstruct.smeltery.items;
+
+import java.util.List;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.*;
+import tconstruct.tools.items.Pattern;
+
+public class ClayPattern extends Pattern
+{
+
+    public ClayPattern(String patternType, String folder)
+    {
+        super(patternName, getPatternNames(patternType), folder);
+    }
+
+    protected static String[] getPatternNames (String partType)
+    {
+        String[] names = new String[patternName.length];
+        for (int i = 0; i < patternName.length; i++)
+            if (!(patternName[i].equals("")))
+                names[i] = partType + patternName[i];
+            else
+                names[i] = "";
+        return names;
+    }
+
+    private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "", "", "", "", "", "", "", "", "fullguard", "", "", "arrowhead", "gem", "nugget" };
+
+    @Override
+    public void getSubItems (Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
+    {
+        for (int i = 0; i < patternName.length; i++)
+            if (!(patternName[i].equals("")))
+                p_150895_3_.add(new ItemStack(p_150895_1_, 1, i));
+    }
+}

src/main/java/tconstruct/smeltery/items/FilledBucket.java

@@ -180,7 +180,7 @@ public String getUnlocalizedName (ItemStack stack)
         return getUnlocalizedName() + "." + materialNames[arr];
     }
 
-    public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron", "Lumium", "Signalum", "Mithril", "Enderium" };
+    public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron", "Lumium", "Signalum", "Mithril", "Enderium", "Quartz" };
 
-    public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron", "lumium", "signalum", "mithril", "enderium" };
+    public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron", "lumium", "signalum", "mithril", "enderium", "quartz" };
 }

src/main/java/tconstruct/weaponry/TinkerWeaponry.java

@@ -47,6 +47,7 @@
 import tconstruct.weaponry.items.Boneana;
 import tconstruct.weaponry.items.GlassArrows;
 import tconstruct.weaponry.items.WeaponryPattern;
+import tconstruct.weaponry.items.WeaponryPatternClay;
 import tconstruct.library.weaponry.AmmoItem;
 import tconstruct.library.weaponry.AmmoWeapon;
 import tconstruct.library.weaponry.ArrowShaftMaterial;
@@ -93,6 +94,8 @@ public class TinkerWeaponry {
     // patterns/casts
     public static Pattern woodPattern;
     public static Pattern metalPattern;
+    public static Pattern clayPattern;
+
 
     // legendary weapons?
     public static GlassArrows glassArrows;
@@ -189,6 +192,8 @@ private void registerItems()
 
         woodPattern = new WeaponryPattern("pattern_", "Pattern");
         metalPattern = new WeaponryPattern("cast_", "MetalPattern");
+        clayPattern = new WeaponryPatternClay("clay_cast_", "ClayPattern");
+
 
         // register tool parts
         GameRegistry.registerItem(bowstring, "bowstring"); // 1.8 todo: rename properly?
@@ -213,6 +218,8 @@ private void registerItems()
         // register patterns/casts
         GameRegistry.registerItem(woodPattern, "Pattern");
         GameRegistry.registerItem(metalPattern, "Cast");
+        GameRegistry.registerItem(clayPattern, "Clay Cast");
+
     }
 
     private void addPartRecipies()
@@ -256,21 +263,25 @@ private void addPartRecipies()
             LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
             for (int i = 0; i < patternOutputs.length; i++) {
                 ItemStack cast = new ItemStack(metalPattern, 1, i);
-
+                ItemStack clay_cast = new ItemStack(clayPattern, 1, i);
+
                 tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50);
-				if (!PHConstruct.removeGoldCastRecipes)
+               if (!PHConstruct.removeGoldCastRecipes)
 					tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[i], 1, Short.MAX_VALUE), false, 50);
 
                 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]);
                     tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50);
+                    tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50);
                     Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount);
                 }
             }
 
             ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, 25);
+            ItemStack clay_cast = new ItemStack(TinkerSmeltery.clayPattern, 1, 25);
+
             tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50);
             if (!PHConstruct.removeGoldCastRecipes)
             	tableCasting.addCastingRecipe(cast, new FluidStack(TinkerSmeltery.moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(arrowhead, 1, Short.MAX_VALUE), false, 50);
@@ -280,6 +291,7 @@ private void addPartRecipies()
                 int fluidAmount = ((IPattern) TinkerSmeltery.metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2;
                 ItemStack metalCast = new ItemStack(arrowhead, 1, liquidDamage[iterTwo]);
                 tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50);
+                tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50);
                 Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount);
             }
 

src/main/java/tconstruct/weaponry/items/WeaponryPatternClay.java

@@ -0,0 +1,54 @@
+package tconstruct.weaponry.items;
+
+import tconstruct.util.Reference;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import tconstruct.tools.items.Pattern;
+
+import java.util.List;
+
+public class WeaponryPatternClay extends Pattern {
+    private static final String[] patternName = new String[] { "", "", "", "bowlimb" };
+
+    public WeaponryPatternClay(String patternType, String name) {
+        super(patternName, getPatternNames(patternName, patternType), "patterns/");
+
+        this.setUnlocalizedName(Reference.prefix(name));
+    }
+
+    public static String[] getPatternNames (String[] patternName, String partType)
+    {
+        String[] names = new String[patternName.length];
+        for (int i = 0; i < patternName.length; i++)
+            if (!(patternName[i].equals("")))
+                names[i] = partType + patternName[i];
+            else
+                names[i] = "";
+        return names;
+    }
+
+    @Override
+    public void getSubItems (Item b, CreativeTabs tab, List list)
+    {
+        for (int i = 0; i < patternName.length; i++)
+        {
+            // if (i != 23)
+            if (!(patternName[i].equals("")))
+            list.add(new ItemStack(b, 1, i));
+        }
+    }
+
+
+    @Override
+    public int getPatternCost(ItemStack pattern) {
+        switch(pattern.getItemDamage())
+        {
+            case 0: return 1; // shuriken
+            case 1: return 8; // crossbow limb
+            case 2: return 10; // crossbow body
+            case 3: return 3; // bowlimb
+        }
+        return 0;
+    }
+}

src/main/resources/assets/tinker/lang/en_US.lang

@@ -271,6 +271,39 @@ item.tconstruct.MetalPattern.crossbowbody.name=Crossbow Body Cast
 item.tconstruct.MetalPattern.bowlimb.name=Bow Limb Cast
 item.tconstruct.GearPattern.name=Gear Cast
 
+item.tconstruct.ClayPattern.rod.name=Tool Rod Clay Cast
+item.tconstruct.ClayPattern.pickaxe.name=Pickaxe Head Clay Cast
+item.tconstruct.ClayPattern.shovel.name=Shovel Head Clay Cast
+item.tconstruct.ClayPattern.axe.name=Axe Head Clay Cast
+item.tconstruct.ClayPattern.swordblade.name=Sword Blade Clay Cast
+item.tconstruct.ClayPattern.largeguard.name=Wide Guard Clay Cast
+item.tconstruct.ClayPattern.mediumguard.name=Hand Guard Clay Cast
+item.tconstruct.ClayPattern.crossbar.name=Crossbar Clay Cast
+item.tconstruct.ClayPattern.binding.name=Tool Binding Clay Cast
+item.tconstruct.ClayPattern.frypan.name=Pan Clay Cast
+item.tconstruct.ClayPattern.sign.name=Wide Board Clay Cast
+item.tconstruct.ClayPattern.knifeblade.name=Knife Blade Clay Cast
+item.tconstruct.ClayPattern.chisel.name=Chisel Head Clay Cast
+item.tconstruct.ClayPattern.largerod.name=Tough Rod Clay Cast
+item.tconstruct.ClayPattern.toughbinding.name=Tough Binding Clay Cast
+item.tconstruct.ClayPattern.largeplate.name=Large Plate Clay Cast
+item.tconstruct.ClayPattern.broadaxe.name=Broadaxe Head Clay Cast
+item.tconstruct.ClayPattern.scythe.name=Scythe Head Clay Cast
+item.tconstruct.ClayPattern.excavator.name=Excavator Head Clay Cast
+item.tconstruct.ClayPattern.largeblade.name=Large Blade Clay Cast
+item.tconstruct.ClayPattern.hammerhead.name=Hammer Head Clay Cast
+item.tconstruct.ClayPattern.fullguard.name=Full Guard Clay Cast
+item.tconstruct.ClayPattern.bowstring.name=Bowstring Clay Cast
+item.tconstruct.ClayPattern.fletching.name=Fletching Clay Cast
+item.tconstruct.ClayPattern.arrowhead.name=Arrowhead Clay Cast
+item.tconstruct.ClayPattern.ingot.name=Ingot Clay Cast
+item.tconstruct.ClayPattern.gem.name=Gem Clay Cast
+item.tconstruct.ClayPattern.nugget.name=Nugget Clay Cast
+item.tconstruct.ClayPattern.shuriken.name=Shuriken Clay Cast
+item.tconstruct.ClayPattern.crossbowlimb.name=Crossbow Limb Clay Cast
+item.tconstruct.ClayPattern.crossbowbody.name=Crossbow Body Clay Cast
+item.tconstruct.ClayPattern.bowlimb.name=Bow Limb Clay Cast
+
 item.tconstruct.Materials.PaperStack.name=Paper Stack
 item.tconstruct.Materials.SlimeCrystal.name=Slime Crystal
 item.tconstruct.Materials.SearedBrick.name=Seared Brick
@@ -505,6 +538,8 @@ item.tconstruct.bucket.Ender.name=Liquified Ender Bucket
 item.tconstruct.bucket.Slime.name=Liquid Slime Bucket
 item.tconstruct.bucket.PigIron.name=Molten Pig Iron Bucket
 item.tconstruct.bucket.Glue.name=Sticky Glue Bucket
+item.tconstruct.bucket.Quartz.name=Molten Nether Quartz Bucket
+
 
 item.tconstruct.bowstring.string.name=Bowstring
 item.tconstruct.bowstring.enchantedfabriI donc.name=Enchanted Bowstring
@@ -672,6 +707,8 @@ fluid.ender=Liquid Ender
 fluid.slime.blue=Liquid Blueslime
 fluid.pigiron.molten=Pig Iron
 fluid.glue=Glue
+fluid.quartz.molten=Molten Nether Quartz
+
 
 tconstruct.achievementPage.name=TConstruct
 achievement.tconstruct.beginner=Learning to Tinker

src/main/resources/assets/tinker/textures/blocks/liquid_quartz.png.mcmeta

@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}

src/main/resources/assets/tinker/textures/blocks/liquid_quartz_flow.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 3
+  }
+}