From 160b28acd8c5478b998e062e2fa03a73f7e54dd0 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 21 Aug 2013 14:40:22 -0700 Subject: [PATCH] Electrum and invar require ingots to make alloys --- assets/stuff.txt | 0 tconstruct/TConstruct.java | 2 +- tconstruct/blocks/CraftingSlab.java | 7 ++++++- tconstruct/blocks/SlabBase.java | 5 +++++ tconstruct/common/TContent.java | 5 ++--- 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 assets/stuff.txt diff --git a/assets/stuff.txt b/assets/stuff.txt new file mode 100644 index 00000000..e69de29b diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index e82533da..14591d4c 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -45,7 +45,7 @@ import cpw.mods.fml.relauncher.Side; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.29.2", dependencies = "required-after:Forge@[7.7.1.687,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.29.3", dependencies = "required-after:Forge@[7.7.1.687,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { diff --git a/tconstruct/blocks/CraftingSlab.java b/tconstruct/blocks/CraftingSlab.java index e0409c94..f41c6e8c 100644 --- a/tconstruct/blocks/CraftingSlab.java +++ b/tconstruct/blocks/CraftingSlab.java @@ -120,7 +120,7 @@ public class CraftingSlab extends InventoryBlock @Override public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) { - int meta = world.getBlockMetadata(x, y, z); + int meta = world.getBlockMetadata(x, y, z) % 8; switch (meta) { case 0: @@ -203,4 +203,9 @@ public class CraftingSlab extends InventoryBlock return metadata; } + + public int damageDropped (int meta) + { + return meta % 8; + } } diff --git a/tconstruct/blocks/SlabBase.java b/tconstruct/blocks/SlabBase.java index 1851586c..12aa908a 100644 --- a/tconstruct/blocks/SlabBase.java +++ b/tconstruct/blocks/SlabBase.java @@ -99,4 +99,9 @@ public class SlabBase extends Block list.add(new ItemStack(id, 1, iter)); } } + + public int damageDropped (int meta) + { + return meta % 8; + } } diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index 3a2e1499..82d644b2 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1472,9 +1472,6 @@ public class TContent implements IFuelHandler Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, 16), new FluidStack(moltenCobaltFluid, 32), new FluidStack(moltenArditeFluid, 32)); //Manyullyn Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, 48), new FluidStack(moltenAluminumFluid, 80), new FluidStack(moltenIronFluid, 32), new FluidStack(moltenObsidianFluid, 32)); //Alumite - Smeltery.addAlloyMixing(new FluidStack(moltenInvarFluid, 24), new FluidStack(moltenIronFluid, 16), new FluidStack(moltenNickelFluid, 8)); //Invar - Smeltery.addAlloyMixing(new FluidStack(moltenElectrumFluid, 16), new FluidStack(moltenGoldFluid, 8), new FluidStack(moltenSilverFluid, 8)); //Electrum - //Oreberries Smeltery.addMelting(new ItemStack(oreBerries, 4, 0), Block.blockIron.blockID, 0, 100, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue / 9)); //Iron Smeltery.addMelting(new ItemStack(oreBerries, 4, 1), Block.blockGold.blockID, 0, 100, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue / 9)); //Gold @@ -2173,12 +2170,14 @@ public class TContent implements IFuelHandler { ItemStack ingot = ores.get(0); tableCasting.addCastingRecipe(ingot, new FluidStack(moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(moltenInvarFluid, 24), new FluidStack(moltenIronFluid, 16), new FluidStack(moltenNickelFluid, 8)); //Invar } ores = OreDictionary.getOres("ingotElectrum"); if (ores.size() > 0) { ItemStack ingot = ores.get(0); tableCasting.addCastingRecipe(ingot, new FluidStack(moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(moltenElectrumFluid, 16), new FluidStack(moltenGoldFluid, 8), new FluidStack(moltenSilverFluid, 8)); //Electrum } ores = OreDictionary.getOres("blockNickel");