Nether version of the Smeltery

src/tconstruct/TConstruct.java

@@ -32,7 +32,7 @@
  * @author mDiyo
  */
 
-@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion")
+@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1.3", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion")
 @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class)
 public class TConstruct
 {

src/tconstruct/blocks/LavaTankBlock.java

@@ -29,6 +29,7 @@
 public class LavaTankBlock extends BlockContainer
 {
     public Icon[] icons;
+    String texturePrefix = "";
 
     public LavaTankBlock(int id)
     {
@@ -39,10 +40,20 @@ public LavaTankBlock(int id)
         setUnlocalizedName("TConstruct.LavaTank");
         setStepSound(Block.soundGlassFootstep);
     }
+
+    public LavaTankBlock(int id, String prefix)
+    {
+        this(id);
+        texturePrefix = prefix;
+    }
 
     public String[] getTextureNames ()
     {
         String[] textureNames = { "lavatank_side", "lavatank_top", "searedgague_top", "searedgague_side", "searedgague_bottom", "searedwindow_top", "searedwindow_side", "searedwindow_bottom" };
+
+        if (!texturePrefix.equals(""))
+            for (int i = 0; i < textureNames.length; i++)
+                textureNames[i] = texturePrefix+"_"+textureNames[i];
 
         return textureNames;
     }

src/tconstruct/blocks/SearedBlock.java

@@ -32,6 +32,12 @@ public SearedBlock(int id)
         setResistance(20F);
         setStepSound(soundMetalFootstep);
     }
+
+    public SearedBlock(int id, String texture)
+    {
+        this(id);
+        this.texturePrefix = texture;
+    }
 
     @Override
     public TileEntity createTileEntity (World world, int metadata)
@@ -180,11 +186,16 @@ public int getRenderType ()
     {
         return SearedRender.searedModel;
     }
+    String texturePrefix = "";
 
     @Override
     public String[] getTextureNames ()
     {
         String[] textureNames = { "castingtable_top", "castingtable_side", "castingtable_bottom", "faucet", "blockcast_top", "blockcast_side", "blockcast_bottom" };
+
+        if (!texturePrefix.equals(""))
+            for (int i = 0; i < textureNames.length; i++)
+                textureNames[i] = texturePrefix+"_"+textureNames[i];
 
         return textureNames;
     }

src/tconstruct/blocks/SmelteryBlock.java

@@ -29,6 +29,7 @@
 public class SmelteryBlock extends InventoryBlock
 {
     Random rand;
+    String texturePrefix = "";
 
     public SmelteryBlock(int id)
     {
@@ -40,6 +41,12 @@ public SmelteryBlock(int id)
         this.setCreativeTab(TConstructRegistry.blockTab);
         this.setUnlocalizedName("tconstruct.Smeltery");
     }
+
+    public SmelteryBlock(int id, String prefix)
+    {
+        this(id);
+        texturePrefix = prefix;
+    }
 
     /* Rendering */
 
@@ -54,6 +61,10 @@ public String[] getTextureNames ()
     {
         String[] textureNames = { "smeltery_side", "smeltery_inactive", "smeltery_active", "drain_side", "drain_out", "drain_basin", "searedbrick", "searedstone", "searedcobble", "searedpaver",
                 "searedbrickcracked", "searedroad", "searedbrickfancy", "searedbricksquare", "searedcreeper" };
+
+        if (!texturePrefix.equals(""))
+            for (int i = 0; i < textureNames.length; i++)
+                textureNames[i] = texturePrefix+"_"+textureNames[i];
 
         return textureNames;
     }

src/tconstruct/blocks/SoilBlock.java

@@ -13,7 +13,7 @@
 
 public class SoilBlock extends TConstructBlock
 {
-    static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue" };
+    static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue", "nether_grout" };
 
     public SoilBlock(int id)
     {

src/tconstruct/blocks/logic/SmelteryLogic.java

@@ -864,7 +864,7 @@ public int recurseStructureDown (int x, int y, int z, int count)
                 Block block = Block.blocksList[blockID];
                 if (block != null && !block.isAirBlock(worldObj, xPos, y, zPos))
                 {
-                    if (blockID == TContent.smeltery.blockID)
+                    if (validBlockID(blockID))
                         return validateBottom(x, y, z, count);
                     else
                         return count;
@@ -899,7 +899,7 @@ public int validateBottom (int x, int y, int z, int count)
         {
             for (int zPos = z - 1; zPos <= z + 1; zPos++)
             {
-                if (worldObj.getBlockId(xPos, y, zPos) == TContent.smeltery.blockID && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2))
+                if (validBlockID(worldObj.getBlockId(xPos, y, zPos)) && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2))
                     bottomBricks++;
             }
         }
@@ -919,7 +919,7 @@ int checkBricks (int x, int y, int z)
     {
         int tempBricks = 0;
         int blockID = worldObj.getBlockId(x, y, z);
-        if (blockID == TContent.smeltery.blockID || blockID == TContent.lavaTank.blockID)
+        if (validBlockID(blockID) || validTankID(blockID))
         {
             TileEntity te = worldObj.getBlockTileEntity(x, y, z);
             if (te == this)
@@ -947,6 +947,16 @@ else if (servant.setMaster(this.xCoord, this.yCoord, this.zCoord))
         }
         return tempBricks;
     }
+
+    boolean validBlockID(int blockID)
+    {
+        return blockID == TContent.smeltery.blockID || blockID == TContent.smelteryNether.blockID;
+    }
+
+    boolean validTankID(int blockID)
+    {
+        return blockID == TContent.lavaTank.blockID || blockID == TContent.lavaTankNether.blockID;
+    }
 
     public int getCapacity ()
     {

src/tconstruct/blocks/slime/SlimeGrass.java

@@ -136,8 +136,8 @@ else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
     public int idDropped (int metadata, Random random, int fortune)
     {
         if (metadata == 1)
-            return TContent.craftedSoil.blockID;
-        else
             return Block.dirt.blockID;
+        else
+            return TContent.craftedSoil.blockID;
     }
 }

src/tconstruct/common/TContent.java

@@ -143,6 +143,9 @@ public class TContent implements IFuelHandler
     public static Block lavaTank;
     public static Block searedBlock;
     public static Block castingChannel;
+    public static Block smelteryNether;
+    public static Block lavaTankNether;
+    public static Block searedBlockNether;
     public static Block metalBlock;
     public static Block tankAir;
 
@@ -286,7 +289,7 @@ public class TContent implements IFuelHandler
     public static Item leggingsWood;
     public static Item bootsWood;
     public static EnumArmorMaterial materialWood;
-    
+
     //Armor - exosuit
     public static Item exoGoggles;
     public static Item exoChest;
@@ -393,7 +396,9 @@ void registerBlocks ()
 
         //Smeltery
         smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery");
+        smelteryNether = new SmelteryBlock(PHConstruct.smelteryNether, "nether").setUnlocalizedName("Smeltery");
         GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery");
+        GameRegistry.registerBlock(smelteryNether, SmelteryItemBlock.class, "SmelteryNether");
         if (PHConstruct.newSmeltery)
         {
             GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery");
@@ -406,13 +411,16 @@ void registerBlocks ()
         }
         GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants");
 
-        lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank");
-        lavaTank.setStepSound(Block.soundGlassFootstep);
+        lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setStepSound(Block.soundGlassFootstep).setUnlocalizedName("LavaTank");
+        lavaTankNether = new LavaTankBlock(PHConstruct.lavaTankNether, "nether").setStepSound(Block.soundGlassFootstep).setUnlocalizedName("LavaTank");
         GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank");
+        GameRegistry.registerBlock(lavaTankNether, LavaTankItemBlock.class, "LavaTankNether");
         GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank");
 
         searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock");
+        searedBlockNether = new SearedBlock(PHConstruct.searedTableNether, "nether").setUnlocalizedName("SearedBlock");
         GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock");
+        GameRegistry.registerBlock(searedBlockNether, SearedTableItemBlock.class, "SearedBlockNether");
         GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable");
         GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet");
         GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin");
@@ -1220,8 +1228,9 @@ private void addRecipesForCraftingTable ()
         GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt);
         // Grout Recipes
         GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel);
-        GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.stainedClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel);
-        GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel);
+        GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 8, 1), new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), Block.sand, Block.sand, Block.sand, Block.sand, Block.gravel,
+                Block.gravel, Block.gravel, Block.gravel);
+        GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 6), Item.netherStalkSeeds, Block.slowSand, Block.gravel);
         // Graveyard Soil Recipes
         GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15));
         // Silky Cloth Recipes
@@ -1328,6 +1337,18 @@ private void addRecipesForCraftingTable ()
         GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin
         GameRegistry.addRecipe(new ItemStack(castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel
 
+        searedBrick = new ItemStack(materials, 1, 37);
+        GameRegistry.addRecipe(new ItemStack(smelteryNether, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); //Controller
+        GameRegistry.addRecipe(new ItemStack(smelteryNether, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain
+        GameRegistry.addRecipe(new ItemStack(smelteryNether, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTankNether, 1, 0), patSurround, '#', searedBrick, 'm', "glass")); //Tank
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTankNether, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "glass")); //Glass
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTankNether, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "glass")); //Window
+        GameRegistry.addRecipe(new ItemStack(searedBlockNether, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table
+        GameRegistry.addRecipe(new ItemStack(searedBlockNether, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet
+        GameRegistry.addRecipe(new ItemStack(searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin
+        GameRegistry.addRecipe(new ItemStack(castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel
+
         // Jack o'Latern Recipe - Stone Torch
         GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 's', new ItemStack(stoneTorch));
         // Stone Torch Recipe
@@ -1439,11 +1460,12 @@ private void addRecipesForFurnace ()
         FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime
         FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item
         FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime
+        FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 6, new ItemStack(materials, 1, 37), 2f); //Nether seared brick
         //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f);
         //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f);
         FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f);
         FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f);
-        FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 11), 0.5f);
+        FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 12), 0.5f);
 
         FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f);
         FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f);
@@ -1648,7 +1670,7 @@ private void addRecipesForTableCasting ()
             }
         }
 
-        ItemStack[] ingotShapes = { new ItemStack(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(materials, 1, 2) };
+        ItemStack[] ingotShapes = { new ItemStack(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(materials, 1, 2), new ItemStack(materials, 1, 37) };
         for (int i = 0; i < ingotShapes.length; i++)
         {
             tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50);
@@ -2247,6 +2269,12 @@ else if (objArray[var4 + 1] instanceof ItemStack)
     public void modIntegration ()
     {
         ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), "");
+        /* Natura */
+        Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted");
+        Block heatSand = GameRegistry.findBlock("Natura", "heatsand");
+        if (taintedSoil != null && heatSand != null)
+            GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 6), Item.netherStalkSeeds, taintedSoil, heatSand);
+
         /*TE3 Flux*/
         ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1);
         if (batHardened != null)
@@ -2258,9 +2286,9 @@ public void modIntegration ()
         {
             modF.batteries.add(basicCell);
         }
-		if (batHardened != null)
+        if (batHardened != null)
             TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened);
-		if (basicCell != null)
+        if (basicCell != null)
             TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell);
 
         /* IC2 */
@@ -2408,7 +2436,6 @@ public void modIntegration ()
         {
             FurnaceRecipes.smelting().addSmelting(materials.itemID, 36, ores.get(0), 0.2f);
         }
-        //new ItemStack(materials, 1, 36)
     }
 
     public static Object getStaticItem (String name, String classPackage)

src/tconstruct/items/MaterialItem.java

@@ -24,10 +24,10 @@ private static String[] getTextures ()
     static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone",
             "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget",
             "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget",
-            "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall" };
+            "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick" };
 
     static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone",
             "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron",
             "nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn",
-            "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball" };
+            "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball", "searedbrick_nether" };
 }

src/tconstruct/items/blocks/CraftedSoilItemBlock.java

@@ -12,7 +12,7 @@
 
 public class CraftedSoilItemBlock extends ItemBlock
 {
-    public static final String blockType[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt" };
+    public static final String blockType[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt", "Grout" };
 
     public CraftedSoilItemBlock(int id)
     {

src/tconstruct/util/config/PHConstruct.java

@@ -102,6 +102,10 @@ public static void initProps (File location)
         barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482);
         barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483);
         barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487);
+
+        lavaTankNether = config.getBlock("Nether Lava Tank", 3187).getInt(3187);
+        smelteryNether = config.getBlock("Nether Smeltery", 3188).getInt(3188);
+        searedTableNether = config.getBlock("Nether Seared Block", 3189).getInt(3189);
 
         slimeChannel = config.getBlock("Slime Channel", 3190).getInt(3190);
         slimePad = config.getBlock("Slime Pad", 3191).getInt(3191);
@@ -411,6 +415,9 @@ public static void initProps (File location)
     public static int lavaTank;
     public static int smeltery;
     public static int searedTable;
+    public static int lavaTankNether;
+    public static int smelteryNether;
+    public static int searedTableNether;
     public static int castingChannel;
     public static int airTank;