diff --git a/resources/tinkerlang/en_US.xml b/resources/tinkerlang/en_US.xml
index cbc8894c..de1f3f3f 100644
--- a/resources/tinkerlang/en_US.xml
+++ b/resources/tinkerlang/en_US.xml
@@ -50,4 +50,22 @@
Blank Pattern
Blank Cast
+ Liquid Iron Bucket
+ Liquid Gold Bucket
+ Liquid Copper Bucket
+ Liquid Tin Bucket
+ Liquid Aluminum Bucket
+ Liquid Cobalt Bucket
+ Liquid Ardite Bucket
+ Liquid Bronze Bucket
+ Liquid Aluminum Brass Bucket
+ Liquid Manyullyn Bucket
+ Liquid Alumite Bucket
+ Liquid Obsidian Bucket
+ Liquid Steel Bucket
+ Liquid Manganese Bucket
+ Liquid Heptazion Bucket
+ Liquid Damascus Steel Bucket
+ Liquid Angmallen Bucket
+
\ No newline at end of file
diff --git a/tinker/tconstruct/TConstruct.java b/tinker/tconstruct/TConstruct.java
index 9fdae1dd..f359004d 100644
--- a/tinker/tconstruct/TConstruct.java
+++ b/tinker/tconstruct/TConstruct.java
@@ -34,10 +34,12 @@ import cpw.mods.fml.common.registry.GameRegistry;
* @author: mDiyo
*/
-@Mod(modid = "TConstruct", name = "TConstruct", version = "1.4.7_1.1.10")
+@Mod(modid = "TConstruct", name = "TConstruct", version = "1.4.7_1.1.12")
@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tinker.tconstruct.TPacketHandler.class)
public class TConstruct
{
+ public static int ingotLiquidValue = 144;
+
/* Instance of this mod, used for grabbing prototype fields */
@Instance("TConstruct")
public static TConstruct instance;
diff --git a/tinker/tconstruct/TContent.java b/tinker/tconstruct/TContent.java
index 3052273f..c986c646 100644
--- a/tinker/tconstruct/TContent.java
+++ b/tinker/tconstruct/TContent.java
@@ -106,13 +106,11 @@ public class TContent implements IFuelHandler
createEntities();
registerBlocks();
registerItems();
- addRenderMappings();
registerMaterials();
addToolRecipes();
addSmelteryRecipes();
addCraftingRecipes();
setupToolTabs();
- addToolButtons();
GameRegistry.registerFuelHandler(this);
}
@@ -226,35 +224,7 @@ public class TContent implements IFuelHandler
//lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setItemName("tconstruct.LumberHead");
}
- void addRenderMappings ()
- {
- String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel" };
- String[] effectTypes = { "diamond", "emerald", "redstone", "glowstone", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis" };
- for (int partIter = 0; partIter < partTypes.length; partIter++)
- {
- materialRenderMap(partIter, partTypes[partIter]);
- }
- for (int effectIter = 0; effectIter < effectTypes.length; effectIter++)
- {
- effectRenderMap(effectIter, effectTypes[effectIter]);
- }
- }
-
- void materialRenderMap (int materialID, String partialLocation)
- {
- for (ToolCore tool : TConstructRegistry.getToolMapping())
- {
- tool.partTextures.put(materialID, tool.getToolTextureFile() + partialLocation);
- }
- }
-
- void effectRenderMap (int materialID, String partialLocation)
- {
- for (ToolCore tool : TConstructRegistry.getToolMapping())
- {
- tool.effectTextures.put(materialID, tool.getToolTextureFile() + partialLocation);
- }
- }
+
void registerMaterials ()
{
@@ -361,7 +331,7 @@ public class TContent implements IFuelHandler
LiquidCasting lc = LiquidCasting.instance;
//Blank
- lc.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, 1, 10), 50);
+ lc.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new LiquidStack(liquidMetalStill.blockID, 1, 8), 50);
//Ingots
lc.addCastingRecipe(new ItemStack(Item.ingotIron), new LiquidStack(liquidMetalStill.blockID, 1, 0), ingotcast, 50); //Iron
@@ -371,15 +341,13 @@ public class TContent implements IFuelHandler
lc.addCastingRecipe(new ItemStack(materials, 1, 11), new LiquidStack(liquidMetalStill.blockID, 1, 4), ingotcast, 50); //aluminum
lc.addCastingRecipe(new ItemStack(materials, 1, 3), new LiquidStack(liquidMetalStill.blockID, 1, 5), ingotcast, 50); //cobalt
lc.addCastingRecipe(new ItemStack(materials, 1, 4), new LiquidStack(liquidMetalStill.blockID, 1, 6), ingotcast, 50); //ardite
- lc.addCastingRecipe(new ItemStack(materials, 1, 5), new LiquidStack(liquidMetalStill.blockID, 1, 7), ingotcast, 50); //bronze
- lc.addCastingRecipe(new ItemStack(materials, 1, 13), new LiquidStack(liquidMetalStill.blockID, 1, 8), ingotcast, 50); //albrass
- lc.addCastingRecipe(new ItemStack(materials, 1, 14), new LiquidStack(liquidMetalStill.blockID, 1, 9), ingotcast, 50); //manyullyn
+ lc.addCastingRecipe(new ItemStack(materials, 1, 13), new LiquidStack(liquidMetalStill.blockID, 1, 7), ingotcast, 50); //bronze
+ lc.addCastingRecipe(new ItemStack(materials, 1, 14), new LiquidStack(liquidMetalStill.blockID, 1, 8), ingotcast, 50); //albrass
+ lc.addCastingRecipe(new ItemStack(materials, 1, 5), new LiquidStack(liquidMetalStill.blockID, 1, 9), ingotcast, 50); //manyullyn
lc.addCastingRecipe(new ItemStack(materials, 1, 15), new LiquidStack(liquidMetalStill.blockID, 1, 10), ingotcast, 50); //alumite
// obsidian
lc.addCastingRecipe(new ItemStack(materials, 1, 16), new LiquidStack(liquidMetalStill.blockID, 1, 12), ingotcast, 50); //steel
-
-
liquids = new LiquidStack[] {
new LiquidStack(liquidMetalStill.blockID, 1, 0),
new LiquidStack(liquidMetalStill.blockID, 1, 2),
@@ -407,21 +375,25 @@ public class TContent implements IFuelHandler
void addSmelteryRecipes()
{
//Ore
- Smeltery.addMelting(Block.oreIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, 250, 0));
- Smeltery.addMelting(Block.oreGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, 250, 1));
+ Smeltery.addMelting(Block.oreIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 0));
+ Smeltery.addMelting(Block.oreGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 1));
- //Ingots
- Smeltery.addMelting(new ItemStack(Item.ingotIron, 8), Block.blockSteel.blockID, 0, 500, new LiquidStack(liquidMetalStill.blockID, 250, 0));
- Smeltery.addMelting(new ItemStack(Item.ingotGold, 8), Block.blockGold.blockID, 0, 450, new LiquidStack(liquidMetalStill.blockID, 250, 1));
+ //Items
+ Smeltery.addMelting(new ItemStack(Item.ingotIron, 8), Block.blockSteel.blockID, 0, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 0));
+ Smeltery.addMelting(new ItemStack(Item.ingotGold, 8), Block.blockGold.blockID, 0, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 1));
+ Smeltery.addMelting(new ItemStack(Item.goldNugget, 8), Block.blockGold.blockID, 0, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 1));
//Blocks
- Smeltery.addMelting(Block.blockSteel, 0, 600, new LiquidStack(liquidMetalStill.blockID, 2250, 0));
- Smeltery.addMelting(Block.blockGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, 2250, 1));
- Smeltery.addMelting(Block.obsidian, 0, 800, new LiquidStack(liquidMetalStill.blockID, 250, 11));
+ Smeltery.addMelting(Block.blockSteel, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 0));
+ Smeltery.addMelting(Block.blockGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 1));
+ Smeltery.addMelting(Block.obsidian, 0, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 11));
//Alloys
- Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 4, 7), new LiquidStack(liquidMetalStill.blockID, 3, 2), new LiquidStack(liquidMetalStill.blockID, 1, 3));
- Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 4, 8), new LiquidStack(liquidMetalStill.blockID, 3, 4), new LiquidStack(liquidMetalStill.blockID, 1, 2));
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 4, 7), new LiquidStack(liquidMetalStill.blockID, 3, 2), new LiquidStack(liquidMetalStill.blockID, 1, 3)); //Bronze
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 4, 8), new LiquidStack(liquidMetalStill.blockID, 3, 4), new LiquidStack(liquidMetalStill.blockID, 1, 2)); //Aluminum Brass
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 2, 9), new LiquidStack(liquidMetalStill.blockID, 1, 5), new LiquidStack(liquidMetalStill.blockID, 1, 6)); //Manyullyn
+ Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 9, 10), new LiquidStack(liquidMetalStill.blockID, 5, 4),
+ new LiquidStack(liquidMetalStill.blockID, 2, 0), new LiquidStack(liquidMetalStill.blockID, 2, 11)); //Alumite
}
void addCraftingRecipes ()
@@ -491,65 +463,7 @@ public class TContent implements IFuelHandler
TConstruct.toolTab.init(tool);
}
- static int[][] slotTypes = { new int[] { 0, 3, 0 }, //Repair
- new int[] { 1, 4, 0 }, //Pickaxe
- new int[] { 2, 5, 0 }, //Shovel
- new int[] { 2, 6, 0 }, //Axe
- //new int[] {2, 9, 0}, //Lumber Axe
- //new int[] {1, 7, 0}, //Ice Axe
- new int[] { 3, 8, 0 }, //Mattock
- new int[] { 1, 0, 1 }, //Broadsword
- new int[] { 1, 1, 1 }, //Longsword
- new int[] { 1, 2, 1 }, //Rapier
- new int[] { 2, 3, 1 }, //Frying pan
- new int[] { 2, 4, 1 } //Battlesign
- };
-
- static int[][] iconCoords = { new int[] { 0, 1, 2 }, new int[] { 13, 13, 13 }, //Repair
- new int[] { 0, 0, 1 }, new int[] { 2, 3, 3 }, //Pickaxe
- new int[] { 3, 0, 13 }, new int[] { 2, 3, 13 }, //Shovel
- new int[] { 2, 0, 13 }, new int[] { 2, 3, 13 }, //Axe
- //new int[] { 6, 0, 13 }, new int[] { 2, 3, 13 }, //Lumber Axe
- //new int[] { 0, 0, 5 }, new int[] { 2, 3, 3 }, //Ice Axe
- new int[] { 2, 0, 3 }, new int[] { 2, 3, 2 }, //Mattock
- new int[] { 1, 0, 2 }, new int[] { 2, 3, 3 }, //Broadsword
- new int[] { 1, 0, 3 }, new int[] { 2, 3, 3 }, //Longsword
- new int[] { 1, 0, 4 }, new int[] { 2, 3, 3 }, //Rapier
- new int[] { 4, 0, 13 }, new int[] { 2, 3, 13 }, //Frying Pan
- new int[] { 5, 0, 13 }, new int[] { 2, 3, 13 } //Battlesign
- };
-
- static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Axe",
- //"Lumber Axe",
- //"Ice Axe",
- "Mattock", "Broadsword", "Longsword", "Rapier", "Frying Pan", "Battlesign" };
-
- static String[] toolDescriptions = { "The main way to repair or change your tools. Place a tool and a material on the left to get started.",
- "The Pickaxe is a basic mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle",
- "The Shovel is a basic digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle",
- "The Axe is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle",
- //"The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle",
- //"The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle",
- "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle",
- "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle",
- "The Longsword is a balanced weapon. It is useful for knocking enemies away or getting in and out of battle quickly.\n\nNatural Ability:\n- Charge Boost\nDamage: Moderate\nDurability: Moderate\n\nRequired parts:\n- Sword Blade\n- Hand Guard\n- Handle",
- "The Rapier is an offensive weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nDamage: High\nDurability: Low\n\nRequired parts:\n- Sword Blade\n- Crossbar\n- Handle",
- "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Bash\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle",
- //"The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle"
- "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle" };
-
- void addToolButtons ()
- {
- for (int i = 0; i < toolNames.length; i++)
- {
- addToolButton(slotTypes[i][0], slotTypes[i][1], slotTypes[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]);
- }
- }
-
- void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body)
- {
- TConstructRegistry.toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body));
- }
+
public void oreRegistry ()
{
@@ -581,6 +495,15 @@ public class TContent implements IFuelHandler
OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7));
OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8));
OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9));
+
+
+ String[] liquidNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "Brass", "Manyullyn", "Alumite", "Obsidian", "Steel" };
+ for (int iter = 0; iter < liquidNames.length; iter++)
+ {
+ LiquidStack liquidstack = new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, iter);
+ LiquidDictionary.getOrCreateLiquid("Molten "+liquidNames[iter], liquidstack);
+ LiquidContainerRegistry.registerLiquid(new LiquidContainerData(liquidstack, new ItemStack(buckets, 1, iter), new ItemStack(Item.bucketEmpty)));
+ }
}
public void modIntegration ()
@@ -588,148 +511,144 @@ public class TContent implements IFuelHandler
/* Liquids */
//Block[] liquids = new Block[] { ironStill, goldStill, copperStill, tinStill, aluminumStill, cobaltStill,
//arditeStill, bronzeStill, alBrassStill, manyullynStill, alumiteStill, obsidianStill, steelStill };
- String[] liquidNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "Brass", "Manyullyn", "Alumite", "Obsidian", "Steel" };
- for (int iter = 0; iter < liquidNames.length; iter++)
- {
- LiquidStack liquidstack = new LiquidStack(liquidMetalStill.blockID, LiquidContainerRegistry.BUCKET_VOLUME, iter);
- LiquidDictionary.getOrCreateLiquid("Liquid"+liquidNames[iter], liquidstack);
- LiquidContainerRegistry.registerLiquid(new LiquidContainerData(liquidstack, new ItemStack(buckets, 1, iter), new ItemStack(Item.bucketEmpty)));
- }
/* Ore Dictionary */
+ //Ingots
ArrayList copperIngots = OreDictionary.getOres("ingotCopper");
for (ItemStack copper : copperIngots)
{
PatternBuilder.instance.registerMaterial(copper, 2, "Copper");
- Smeltery.addMelting(copper, metalBlock.blockID, 3, 450, new LiquidStack(liquidMetalStill.blockID, 250, 2));
+ Smeltery.addMelting(copper, metalBlock.blockID, 3, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2));
}
ArrayList tinIngots = OreDictionary.getOres("ingotTin");
for (ItemStack tin : tinIngots)
{
- Smeltery.addMelting(tin, metalBlock.blockID, 5, 175, new LiquidStack(liquidMetalStill.blockID, 250, 3));
+ Smeltery.addMelting(tin, metalBlock.blockID, 5, 175, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3));
}
ArrayList bronzeIngots = OreDictionary.getOres("ingotBronze");
for (ItemStack bronze : bronzeIngots)
{
PatternBuilder.instance.registerMaterial(bronze, 2, "Bronze");
- Smeltery.addMelting(bronze, metalBlock.blockID, 4, 500, new LiquidStack(liquidMetalStill.blockID, 250, 7));
+ Smeltery.addMelting(bronze, metalBlock.blockID, 4, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7));
}
ArrayList cobaltIngots = OreDictionary.getOres("ingotCobalt");
for (ItemStack cobalt : cobaltIngots)
{
- Smeltery.addMelting(cobalt, metalBlock.blockID, 0, 650, new LiquidStack(liquidMetalStill.blockID, 250, 5));
+ Smeltery.addMelting(cobalt, metalBlock.blockID, 0, 650, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5));
}
ArrayList arditeIngots = OreDictionary.getOres("ingotArdite");
for (ItemStack ardite : arditeIngots)
{
- Smeltery.addMelting(ardite, metalBlock.blockID, 1, 650, new LiquidStack(liquidMetalStill.blockID, 250, 6));
+ Smeltery.addMelting(ardite, metalBlock.blockID, 1, 650, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6));
}
ArrayList aluminumIngots = OreDictionary.getOres("ingotAluminum");
for (ItemStack aluminum : aluminumIngots)
{
- Smeltery.addMelting(aluminum, metalBlock.blockID, 6, 250, new LiquidStack(liquidMetalStill.blockID, 250, 4));
+ Smeltery.addMelting(aluminum, metalBlock.blockID, 6, 250, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4));
}
ArrayList aluminumRaw = OreDictionary.getOres("naturalAluminum");
for (ItemStack aluminum : aluminumRaw)
{
- Smeltery.addMelting(aluminum, metalBlock.blockID, 6, 250, new LiquidStack(liquidMetalStill.blockID, 250, 4));
+ Smeltery.addMelting(aluminum, metalBlock.blockID, 6, 250, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4));
}
ArrayList manyullynIngots = OreDictionary.getOres("ingotManyullyn");
for (ItemStack manyullyn : manyullynIngots)
{
- Smeltery.addMelting(manyullyn, metalBlock.blockID, 2, 750, new LiquidStack(liquidMetalStill.blockID, 250, 9));
+ Smeltery.addMelting(manyullyn, metalBlock.blockID, 2, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9));
}
ArrayList alBrassIngots = OreDictionary.getOres("ingotAluminumBrass");
for (ItemStack alBrass : alBrassIngots)
{
- Smeltery.addMelting(alBrass, metalBlock.blockID, 7, 350, new LiquidStack(liquidMetalStill.blockID, 250, 8));
+ Smeltery.addMelting(alBrass, metalBlock.blockID, 7, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8));
}
ArrayList alumiteIngots = OreDictionary.getOres("ingotAlumite");
for (ItemStack alumite : alumiteIngots)
{
- Smeltery.addMelting(alumite, metalBlock.blockID, 8, 500, new LiquidStack(liquidMetalStill.blockID, 250, 10));
+ Smeltery.addMelting(alumite, metalBlock.blockID, 8, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10));
}
ArrayList steelIngots = OreDictionary.getOres("ingotSteel");
for (ItemStack steel : steelIngots)
{
- Smeltery.addMelting(steel, metalBlock.blockID, 9, 500, new LiquidStack(liquidMetalStill.blockID, 250, 12));
+ Smeltery.addMelting(steel, metalBlock.blockID, 9, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12));
}
+ //Ores
ArrayList cobaltOres = OreDictionary.getOres("oreCobalt");
for (ItemStack cobalt : cobaltOres)
{
- Smeltery.addMelting(cobalt, 750, new LiquidStack(liquidMetalStill.blockID, 500, 5));
+ Smeltery.addMelting(cobalt, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 5));
}
ArrayList arditeOres = OreDictionary.getOres("oreArdite");
for (ItemStack ardite : arditeOres)
{
- Smeltery.addMelting(ardite, 750, new LiquidStack(liquidMetalStill.blockID, 500, 6));
+ Smeltery.addMelting(ardite, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 6));
}
ArrayList copperOres = OreDictionary.getOres("oreCopper");
for (ItemStack copper : copperOres)
{
- Smeltery.addMelting(copper, 750, new LiquidStack(liquidMetalStill.blockID, 500, 2));
+ Smeltery.addMelting(copper, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 2));
}
ArrayList tinOres = OreDictionary.getOres("oreTin");
for (ItemStack tin : tinOres)
{
- Smeltery.addMelting(tin, 750, new LiquidStack(liquidMetalStill.blockID, 500, 3));
+ Smeltery.addMelting(tin, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 3));
}
ArrayList aluminumOres = OreDictionary.getOres("oreAluminum");
for (ItemStack aluminum : aluminumOres)
{
- Smeltery.addMelting(aluminum, 750, new LiquidStack(liquidMetalStill.blockID, 500, 4));
+ Smeltery.addMelting(aluminum, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*2, 4));
}
+ //Blocks
ArrayList copperblocks = OreDictionary.getOres("blockCopper");
for (ItemStack copper : copperblocks)
{
- Smeltery.addMelting(copper, 450, new LiquidStack(liquidMetalStill.blockID, 2250, 2));
+ Smeltery.addMelting(copper, 450, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 2));
}
ArrayList tinblocks = OreDictionary.getOres("blockTin");
for (ItemStack tin : tinblocks)
{
- Smeltery.addMelting(tin, 175, new LiquidStack(liquidMetalStill.blockID, 2250, 3));
+ Smeltery.addMelting(tin, 175, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 3));
}
ArrayList bronzeblocks = OreDictionary.getOres("blockBronze");
for (ItemStack bronze : bronzeblocks)
{
- Smeltery.addMelting(bronze, 500, new LiquidStack(liquidMetalStill.blockID, 2250, 7));
+ Smeltery.addMelting(bronze, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 7));
}
ArrayList cobaltblocks = OreDictionary.getOres("blockCobalt");
for (ItemStack cobalt : cobaltblocks)
{
- Smeltery.addMelting(cobalt, 650, new LiquidStack(liquidMetalStill.blockID, 2250, 5));
+ Smeltery.addMelting(cobalt, 650, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 5));
}
ArrayList arditeblocks = OreDictionary.getOres("blockArdite");
for (ItemStack ardite : arditeblocks)
{
- Smeltery.addMelting(ardite, 650, new LiquidStack(liquidMetalStill.blockID, 2250, 6));
+ Smeltery.addMelting(ardite, 650, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 6));
}
ArrayList aluminumblocks = OreDictionary.getOres("blockAluminum");
for (ItemStack aluminum : aluminumblocks)
{
- Smeltery.addMelting(aluminum, 250, new LiquidStack(liquidMetalStill.blockID, 2250, 4));
+ Smeltery.addMelting(aluminum, 250, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 4));
}
ArrayList manyullynblocks = OreDictionary.getOres("blockManyullyn");
for (ItemStack manyullyn : manyullynblocks)
{
- Smeltery.addMelting(manyullyn, 750, new LiquidStack(liquidMetalStill.blockID, 2250, 9));
+ Smeltery.addMelting(manyullyn, 750, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 9));
}
ArrayList alBrassblocks = OreDictionary.getOres("blockAluminumBrass");
for (ItemStack alBrass : alBrassblocks)
{
- Smeltery.addMelting(alBrass, 350, new LiquidStack(liquidMetalStill.blockID, 2250, 8));
+ Smeltery.addMelting(alBrass, 350, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 8));
}
ArrayList alumiteblocks = OreDictionary.getOres("blockAlumite");
for (ItemStack alumite : alumiteblocks)
{
- Smeltery.addMelting(alumite, 500, new LiquidStack(liquidMetalStill.blockID, 2250, 10));
+ Smeltery.addMelting(alumite, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 10));
}
ArrayList steelblocks = OreDictionary.getOres("blockSteel");
for (ItemStack steel : steelblocks)
{
- Smeltery.addMelting(steel, 500, new LiquidStack(liquidMetalStill.blockID, 2250, 12));
+ Smeltery.addMelting(steel, 500, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue*9, 12));
}
/* IC2 */
diff --git a/tinker/tconstruct/client/TProxyClient.java b/tinker/tconstruct/client/TProxyClient.java
index 574d6b48..88a69d5b 100644
--- a/tinker/tconstruct/client/TProxyClient.java
+++ b/tinker/tconstruct/client/TProxyClient.java
@@ -18,6 +18,7 @@ import tinker.common.fancyitem.FancyEntityItem;
import tinker.common.fancyitem.FancyItemRender;
import tinker.tconstruct.*;
import tinker.tconstruct.client.entityrender.*;
+import tinker.tconstruct.client.gui.ToolGuiElement;
import tinker.tconstruct.client.liquidrender.*;
import tinker.tconstruct.entity.*;
import tinker.tconstruct.logic.*;
@@ -72,6 +73,16 @@ public class TProxyClient extends TProxyCommon
renderEngine.registerTextureFX(new LiquidSteelFX());
renderEngine.registerTextureFX(new LiquidSteelFlowFX());
+ //Metallurgy
+ renderEngine.registerTextureFX(new LiquidManganeseFX());
+ renderEngine.registerTextureFX(new LiquidManganeseFlowFX());
+ renderEngine.registerTextureFX(new LiquidHeptazionFX());
+ renderEngine.registerTextureFX(new LiquidHeptazionFlowFX());
+ renderEngine.registerTextureFX(new LiquidDamascusSteelFX());
+ renderEngine.registerTextureFX(new LiquidDamascusSteelFlowFX());
+ renderEngine.registerTextureFX(new LiquidAngmallenFX());
+ renderEngine.registerTextureFX(new LiquidAngmallenFlowFX());
+
//Tools
MinecraftForgeClient.preloadTexture(TContent.blockTexture);
IItemRenderer render = new SuperCustomToolRenderer();
@@ -88,6 +99,8 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerEntityRenderingHandler(Skyla.class, new SkylaRender());
RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender());
//RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, new PlayerArmorRender()); // <-- Works, woo!
+
+ addRenderMappings();
}
/* Ties an internal name to a visible one. */
@@ -99,8 +112,7 @@ public class TProxyClient extends TProxyCommon
LanguageRegistry.instance().addStringLocalization("itemGroup.TConstructBlocks", "TConstruct Blocks");*/
String langDir = "/tinkerlang/";
- String[] langFiles =
- { "en_US.xml" };
+ String[] langFiles = { "en_US.xml" };
for (String langFile : langFiles)
{
@@ -218,17 +230,15 @@ public class TProxyClient extends TProxyCommon
LanguageRegistry.addName(TContent.obsidianStill, "Liquid Obsidian");
LanguageRegistry.addName(TContent.steelFlowing, "Liquid Steel");
LanguageRegistry.addName(TContent.steelStill, "Liquid Steel");*/
+
+ addToolButtons ();
}
public static final String[] shardNames = new String[] { "Wood", "Stone Shard", "Iron Chunk", "Flint Shard", "Cactus Shard", "Bone", "Obsidian Shard", "Netherrack Shard", "Slime Crystal Fragment", "Paper", "Cobalt Chunk", "Ardite Chunk", "Manyullyn Chunk", "Copper Chunk", "Bronze Chunk" };
- public static final String[] materialItemInternalNames = new String[] {
- "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone",
- "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" };
+ public static final String[] materialItemInternalNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" };
- public static final String[] materialItemNames = new String[] {
- "Paper Stack", "Slime Crystal", "Seared Brick", "Cobalt Ingot", "Ardite Ingot", "Manyullyn Ingot", "Ball of Moss", "Lava Crystal", "Necrotic Bone",
- "Copper Ingot", "Tin Ingot", "Aluminum Ingot", "Raw Aluminum", "Bronze Ingot", "Aluminum Brass Ingot", "Alumite Ingot", "Steel Ingot" };
+ public static final String[] materialItemNames = new String[] { "Paper Stack", "Slime Crystal", "Seared Brick", "Cobalt Ingot", "Ardite Ingot", "Manyullyn Ingot", "Ball of Moss", "Lava Crystal", "Necrotic Bone", "Copper Ingot", "Tin Ingot", "Aluminum Ingot", "Raw Aluminum", "Bronze Ingot", "Aluminum Brass Ingot", "Alumite Ingot", "Steel Ingot" };
public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze" };
@@ -285,4 +295,87 @@ public class TProxyClient extends TProxyCommon
{
return Minecraft.getMinecraftDir();
}
+
+ static int[][] slotTypes = { new int[] { 0, 3, 0 }, //Repair
+ new int[] { 1, 4, 0 }, //Pickaxe
+ new int[] { 2, 5, 0 }, //Shovel
+ new int[] { 2, 6, 0 }, //Axe
+ //new int[] {2, 9, 0}, //Lumber Axe
+ //new int[] {1, 7, 0}, //Ice Axe
+ new int[] { 3, 8, 0 }, //Mattock
+ new int[] { 1, 0, 1 }, //Broadsword
+ new int[] { 1, 1, 1 }, //Longsword
+ new int[] { 1, 2, 1 }, //Rapier
+ new int[] { 2, 3, 1 }, //Frying pan
+ new int[] { 2, 4, 1 } //Battlesign
+ };
+
+ static int[][] iconCoords = { new int[] { 0, 1, 2 }, new int[] { 13, 13, 13 }, //Repair
+ new int[] { 0, 0, 1 }, new int[] { 2, 3, 3 }, //Pickaxe
+ new int[] { 3, 0, 13 }, new int[] { 2, 3, 13 }, //Shovel
+ new int[] { 2, 0, 13 }, new int[] { 2, 3, 13 }, //Axe
+ //new int[] { 6, 0, 13 }, new int[] { 2, 3, 13 }, //Lumber Axe
+ //new int[] { 0, 0, 5 }, new int[] { 2, 3, 3 }, //Ice Axe
+ new int[] { 2, 0, 3 }, new int[] { 2, 3, 2 }, //Mattock
+ new int[] { 1, 0, 2 }, new int[] { 2, 3, 3 }, //Broadsword
+ new int[] { 1, 0, 3 }, new int[] { 2, 3, 3 }, //Longsword
+ new int[] { 1, 0, 4 }, new int[] { 2, 3, 3 }, //Rapier
+ new int[] { 4, 0, 13 }, new int[] { 2, 3, 13 }, //Frying Pan
+ new int[] { 5, 0, 13 }, new int[] { 2, 3, 13 } //Battlesign
+ };
+
+ static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Axe",
+ //"Lumber Axe",
+ //"Ice Axe",
+ "Mattock", "Broadsword", "Longsword", "Rapier", "Frying Pan", "Battlesign" };
+
+ static String[] toolDescriptions = { "The main way to repair or change your tools. Place a tool and a material on the left to get started.", "The Pickaxe is a basic mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", "The Shovel is a basic digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", "The Axe is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle",
+ //"The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle",
+ //"The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle",
+ "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", "The Longsword is a balanced weapon. It is useful for knocking enemies away or getting in and out of battle quickly.\n\nNatural Ability:\n- Charge Boost\nDamage: Moderate\nDurability: Moderate\n\nRequired parts:\n- Sword Blade\n- Hand Guard\n- Handle", "The Rapier is an offensive weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nDamage: High\nDurability: Low\n\nRequired parts:\n- Sword Blade\n- Crossbar\n- Handle", "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Bash\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle",
+ //"The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle"
+ "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle" };
+
+ void addToolButtons ()
+ {
+ for (int i = 0; i < toolNames.length; i++)
+ {
+ addToolButton(slotTypes[i][0], slotTypes[i][1], slotTypes[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]);
+ }
+ }
+
+ void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body)
+ {
+ TConstructRegistry.toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body));
+ }
+
+ void addRenderMappings ()
+ {
+ String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel" };
+ String[] effectTypes = { "diamond", "emerald", "redstone", "glowstone", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis" };
+ for (int partIter = 0; partIter < partTypes.length; partIter++)
+ {
+ materialRenderMap(partIter, partTypes[partIter]);
+ }
+ for (int effectIter = 0; effectIter < effectTypes.length; effectIter++)
+ {
+ effectRenderMap(effectIter, effectTypes[effectIter]);
+ }
+ }
+
+ void materialRenderMap (int materialID, String partialLocation)
+ {
+ for (ToolCore tool : TConstructRegistry.getToolMapping())
+ {
+ tool.partTextures.put(materialID, tool.getToolTextureFile() + partialLocation);
+ }
+ }
+
+ void effectRenderMap (int materialID, String partialLocation)
+ {
+ for (ToolCore tool : TConstructRegistry.getToolMapping())
+ {
+ tool.effectTextures.put(materialID, tool.getToolTextureFile() + partialLocation);
+ }
+ }
}
diff --git a/tinker/tconstruct/client/gui/SmelteryGui.java b/tinker/tconstruct/client/gui/SmelteryGui.java
index 006d2ca8..4a185ee6 100644
--- a/tinker/tconstruct/client/gui/SmelteryGui.java
+++ b/tinker/tconstruct/client/gui/SmelteryGui.java
@@ -36,7 +36,7 @@ public class SmelteryGui extends GuiContainer
fontRenderer.drawString("Temp: " + logic.getInternalTemperature(), xSize + 6, 6, 0xffffff);
fontRenderer.drawString("Liquid: " + logic.getCapacity(), xSize + 6, 16, 0xffffff);
for (int iter = 0; iter < 9; iter++)
- fontRenderer.drawString("Slot "+iter+" temp: " + logic.getTempForSlot(iter), xSize + 6, 26+iter*10, 0xffffff);
+ fontRenderer.drawString("Slot " + iter + " temp: " + logic.getTempForSlot(iter), xSize + 6, 26 + iter * 10, 0xffffff);
/*for (int iter = 0; iter < 9; iter++)
fontRenderer.drawString("Slot "+iter+" mTemp: " + logic.meltingTemps[iter], xSize + 6, 100+iter*9, 0xffffff);*/
}
@@ -49,7 +49,7 @@ public class SmelteryGui extends GuiContainer
int cornerX = (width - xSize) / 2;
int cornerY = (height - ySize) / 2;
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
-
+
//Fuel - Lava
if (logic.fuelGague > 0)
{
@@ -63,11 +63,11 @@ public class SmelteryGui extends GuiContainer
{
int size = fuel >= 16 ? 16 : fuel;
fuel -= size;
- drawTexturedModalRect(cornerX + 146, (cornerY + 67) - size - 16*count, xTex, yTex+16-size, 9, size);
+ drawTexturedModalRect(cornerX + 146, (cornerY + 67) - size - 16 * count, xTex, yTex + 16 - size, 9, size);
count++;
}
}
-
+
//Liquids - molten metal
int base = 0;
for (LiquidStack liquid : logic.moltenMetal)
@@ -79,7 +79,8 @@ public class SmelteryGui extends GuiContainer
ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0);
renderIndex = liquidBlock.getBlockTextureFromSideAndMetadata(0, liquid.itemMeta);
}
- else //Item
+ else
+ //Item
{
Item liquidItem = Item.itemsList[liquid.itemID];
ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0);
@@ -88,15 +89,18 @@ public class SmelteryGui extends GuiContainer
int xTex = renderIndex % 16 * 16;
int yTex = renderIndex / 16 * 16;
- int liquidSize = liquid.amount * 52 / logic.getCapacity();
- while (liquidSize > 0)
+ if (logic.getCapacity() > 0)
{
- int size = liquidSize >= 16 ? 16 : liquidSize;
- drawTexturedModalRect(cornerX + 13, (cornerY + 68) - size - base, xTex, yTex+16-size, 16, size);
- drawTexturedModalRect(cornerX + 29, (cornerY + 68) - size - base, xTex, yTex+16-size, 16, size);
- drawTexturedModalRect(cornerX + 45, (cornerY + 68) - size - base, xTex, yTex+16-size, 2, size);
- liquidSize -= size;
- base += size;
+ int liquidSize = liquid.amount * 52 / logic.getCapacity();
+ while (liquidSize > 0)
+ {
+ int size = liquidSize >= 16 ? 16 : liquidSize;
+ drawTexturedModalRect(cornerX + 13, (cornerY + 68) - size - base, xTex, yTex + 16 - size, 16, size);
+ drawTexturedModalRect(cornerX + 29, (cornerY + 68) - size - base, xTex, yTex + 16 - size, 16, size);
+ drawTexturedModalRect(cornerX + 45, (cornerY + 68) - size - base, xTex, yTex + 16 - size, 2, size);
+ liquidSize -= size;
+ base += size;
+ }
}
//base = liquid.amount / 10000 * 52;
}
diff --git a/tinker/tconstruct/client/liquidrender/LiquidAngmallenFX.java b/tinker/tconstruct/client/liquidrender/LiquidAngmallenFX.java
new file mode 100644
index 00000000..6ad2defd
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidAngmallenFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidAngmallenFX extends TextureLiquidStillFX
+{
+ public LiquidAngmallenFX()
+ {
+ super(180, 255, 137, 237, 20, 120, 99, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidAngmallenFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidAngmallenFlowFX.java
new file mode 100644
index 00000000..4a7cde6f
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidAngmallenFlowFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidAngmallenFlowFX extends TextureLiquidFlowingFX
+{
+ public LiquidAngmallenFlowFX()
+ {
+ super(180, 255, 137, 237, 20, 120, 99+1, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFX.java b/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFX.java
new file mode 100644
index 00000000..1f5660d2
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidDamascusSteelFX extends TextureLiquidStillFX
+{
+ public LiquidDamascusSteelFX()
+ {
+ super(37, 137, 12, 112, 0, 83, 96, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFlowFX.java
new file mode 100644
index 00000000..b12ec6fb
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidDamascusSteelFlowFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidDamascusSteelFlowFX extends TextureLiquidFlowingFX
+{
+ public LiquidDamascusSteelFlowFX()
+ {
+ super(37, 137, 12, 112, 0, 83, 96+1, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidHeptazionFX.java b/tinker/tconstruct/client/liquidrender/LiquidHeptazionFX.java
new file mode 100644
index 00000000..38b7d703
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidHeptazionFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidHeptazionFX extends TextureLiquidStillFX
+{
+ public LiquidHeptazionFX()
+ {
+ super(66, 166, 43, 143, 66, 166, 76, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidHeptazionFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidHeptazionFlowFX.java
new file mode 100644
index 00000000..fcf1b126
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidHeptazionFlowFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidHeptazionFlowFX extends TextureLiquidFlowingFX
+{
+ public LiquidHeptazionFlowFX()
+ {
+ super(66, 166, 43, 143, 66, 166, 76+1, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidManganeseFX.java b/tinker/tconstruct/client/liquidrender/LiquidManganeseFX.java
new file mode 100644
index 00000000..5f55b1aa
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidManganeseFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidManganeseFX extends TextureLiquidStillFX
+{
+ public LiquidManganeseFX()
+ {
+ super(200, 255, 118, 218, 118, 218, 73, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/client/liquidrender/LiquidManganeseFlowFX.java b/tinker/tconstruct/client/liquidrender/LiquidManganeseFlowFX.java
new file mode 100644
index 00000000..dd7af453
--- /dev/null
+++ b/tinker/tconstruct/client/liquidrender/LiquidManganeseFlowFX.java
@@ -0,0 +1,11 @@
+package tinker.tconstruct.client.liquidrender;
+
+import tinker.tconstruct.TContent;
+
+public class LiquidManganeseFlowFX extends TextureLiquidFlowingFX
+{
+ public LiquidManganeseFlowFX()
+ {
+ super(200, 255, 118, 218, 118, 218, 73+1, TContent.liquidTexture);
+ }
+}
\ No newline at end of file
diff --git a/tinker/tconstruct/items/FilledBucket.java b/tinker/tconstruct/items/FilledBucket.java
index 09065114..f1ff148b 100644
--- a/tinker/tconstruct/items/FilledBucket.java
+++ b/tinker/tconstruct/items/FilledBucket.java
@@ -8,6 +8,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemBucket;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumMovingObjectType;
+import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import tinker.tconstruct.TContent;
@@ -23,6 +24,7 @@ public class FilledBucket extends ItemBucket
super(id, 0);
setTextureFile(TContent.craftingTexture);
setIconIndex(224);
+ setItemName("tconstruct.bucket");
}
public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player)
@@ -163,7 +165,7 @@ public class FilledBucket extends ItemBucket
@Override
public void getSubItems(int id, CreativeTabs tab, List list)
{
- for (int i = 0; i < 13; i++)
+ for (int i = 0; i < 17; i++)
list.add(new ItemStack(id, 1, i));
}
@@ -172,4 +174,14 @@ public class FilledBucket extends ItemBucket
{
return this.iconIndex + meta;
}
+
+ public String getItemNameIS(ItemStack stack)
+ {
+ int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, materialNames.length);
+ return getItemName() + "." +materialNames[arr];
+ }
+
+ public static final String[] materialNames = new String[] {
+ "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AlBrass", "Manyullyn", "Alumite", "Obsidian", "Steel",
+ "Manganese", "Heptazion", "DSteel", "Angmallen"};
}
diff --git a/tinker/tconstruct/logic/CastingTableLogic.java b/tinker/tconstruct/logic/CastingTableLogic.java
index 8435b676..873a9842 100644
--- a/tinker/tconstruct/logic/CastingTableLogic.java
+++ b/tinker/tconstruct/logic/CastingTableLogic.java
@@ -11,13 +11,13 @@ import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.LiquidStack;
import tinker.common.IPattern;
import tinker.common.InventoryLogic;
+import tinker.tconstruct.TConstruct;
import tinker.tconstruct.crafting.CastingRecipe;
import tinker.tconstruct.crafting.LiquidCasting;
public class CastingTableLogic extends InventoryLogic implements ILiquidTank
{
public LiquidStack liquid;
- int baseMax = 250;
float materialRedux = 0;
int castingDelay = 0;
@@ -47,7 +47,7 @@ public class CastingTableLogic extends InventoryLogic implements ILiquidTank
@Override
public int getCapacity ()
{
- int ret = baseMax;
+ int ret = TConstruct.ingotLiquidValue;
if (inventory[0] != null && inventory[0].getItem() instanceof IPattern)
ret *= ((IPattern) inventory[0].getItem()).getPatternCost(inventory[0].getItemDamage());
if (materialRedux > 0)
@@ -63,9 +63,10 @@ public class CastingTableLogic extends InventoryLogic implements ILiquidTank
if (liquid == null)
{
- //System.out.println("Woo");
+ System.out.println("Woo");
if (LiquidCasting.instance.getCastingRecipe(resource, inventory[0]) != null)
{
+ System.out.println("Cast exists");
liquid = resource.copy();
materialRedux = LiquidCasting.instance.getMaterialReduction(resource);
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
diff --git a/tinker/tconstruct/logic/SmelteryLogic.java b/tinker/tconstruct/logic/SmelteryLogic.java
index 43052994..164a2aeb 100644
--- a/tinker/tconstruct/logic/SmelteryLogic.java
+++ b/tinker/tconstruct/logic/SmelteryLogic.java
@@ -339,6 +339,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
public void checkValidStructure (int x, int y, int z)
{
int capacity = 0;
+ validStructure = false;
//System.out.println("Yep");
if (checkSameLevel(x, y, z))
{