From 928f38e6d938427a21d006860d1e38cd2c1364cc Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 17 Nov 2013 00:07:09 -0800 Subject: [PATCH 1/4] Alloys require ingot minimum values --- src/tconstruct/common/TContent.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 5739357b..063441ef 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -46,7 +46,7 @@ public class TContent implements IFuelHandler { // Supresses console spam when iguana's tweaks remove stuff public static boolean supressMissingToolLogs = false; - + //Patterns and other materials public static Item blankPattern; public static Item materials; @@ -1629,12 +1629,17 @@ public class TContent implements IFuelHandler { //Alloys Smelting if (PHConstruct.harderBronze) - Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, 16), new FluidStack(moltenCopperFluid, 24), new FluidStack(moltenTinFluid, 8)); //Bronze + Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze else - Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, 24), new FluidStack(moltenCopperFluid, 24), new FluidStack(moltenTinFluid, 8)); //Bronze - Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, 32), new FluidStack(moltenAluminumFluid, 24), new FluidStack(moltenCopperFluid, 8)); //Aluminum Brass - 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(moltenBronzeFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze + Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 4), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue * 2), new FluidStack( + moltenArditeFluid, TConstruct.ingotLiquidValue * 2)); //Manyullyn + Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), new FluidStack( + moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite // Stone parts for (int sc = 0; sc < patternOutputs.length; sc++) From a6ec407205a2ac24bea78b17e5db04226592a5a5 Mon Sep 17 00:00:00 2001 From: progwml6 Date: Sun, 17 Nov 2013 03:13:26 -0500 Subject: [PATCH 2/4] update TE compat code to work w/ beta versions --- src/tconstruct/common/TContent.java | 2 +- src/tconstruct/library/tools/ToolCore.java | 3 +- src/tconstruct/modifiers/ModFlux.java | 33 ++++++++++++++++------ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 5739357b..cb8bbee1 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2140,7 +2140,7 @@ public class TContent implements IFuelHandler { ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); /*TE3 Flux*/ - ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "batteryHardened", 1); + ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); if (batHardened != null) { modF.batteries.add(batHardened); diff --git a/src/tconstruct/library/tools/ToolCore.java b/src/tconstruct/library/tools/ToolCore.java index 8b529c82..f70c7f94 100644 --- a/src/tconstruct/library/tools/ToolCore.java +++ b/src/tconstruct/library/tools/ToolCore.java @@ -63,7 +63,7 @@ import cpw.mods.fml.relauncher.SideOnly; public abstract class ToolCore extends Item implements IEnergyContainerItem, ICustomElectricItem, IBoxable, IBattlegearWeapon { //TE power constants -- TODO grab these from the - protected int capacity = 80000; + protected int capacity = 400000; protected int maxReceive = 75; protected int maxExtract = 75; @@ -1134,7 +1134,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu } return tags.getInteger("Energy"); } - @Override public int getMaxEnergyStored (ItemStack container) { diff --git a/src/tconstruct/modifiers/ModFlux.java b/src/tconstruct/modifiers/ModFlux.java index eab2f50c..cd7dba35 100644 --- a/src/tconstruct/modifiers/ModFlux.java +++ b/src/tconstruct/modifiers/ModFlux.java @@ -24,23 +24,38 @@ public class ModFlux extends ModBoolean @Override public boolean matches (ItemStack[] input, ItemStack tool) { - if (input[0] == null || input[1] == null) - return false; - boolean battery = false; - for (ItemStack stack : batteries) + if (input[0] != null) { - if (stack.itemID == input[0].itemID && input[0].getItem() instanceof IEnergyContainerItem) + for (ItemStack stack : batteries) { - battery = true; + if (stack.itemID == input[0].itemID && input[0].getItem() instanceof IEnergyContainerItem) + { + battery = true; + } } - if (stack.itemID == input[1].itemID && input[1].getItem() instanceof IEnergyContainerItem) + return battery && canModify(tool, input); + } + + if (input[1] != null) + { + + for (ItemStack stack : batteries) { - battery = true; + if (stack.itemID == input[0].itemID && input[0].getItem() instanceof IEnergyContainerItem) + { + battery = true; + } + if (stack.itemID == input[1].itemID && input[1].getItem() instanceof IEnergyContainerItem) + { + battery = true; + } + return battery && canModify(tool, input); } } - return battery && canModify(tool, input); + + return false; } /*@Override From bf8164882ad92907a74804d649d6f44338fee6e9 Mon Sep 17 00:00:00 2001 From: progwml6 Date: Sun, 17 Nov 2013 03:32:18 -0500 Subject: [PATCH 3/4] npe fix --- src/tconstruct/modifiers/ModFlux.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/modifiers/ModFlux.java b/src/tconstruct/modifiers/ModFlux.java index cd7dba35..a7379e7f 100644 --- a/src/tconstruct/modifiers/ModFlux.java +++ b/src/tconstruct/modifiers/ModFlux.java @@ -81,9 +81,9 @@ public class ModFlux extends ModBoolean modifiers -= 1; tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); int charge = 0; - if (input[0].getItem() instanceof IEnergyContainerItem && input[0].hasTagCompound()) + if (input[0]!= null && input[0].getItem() != null && input[0].getItem() instanceof IEnergyContainerItem && input[0].hasTagCompound()) charge = input[0].getTagCompound().getInteger("Energy"); - if (input[1].getItem() instanceof IEnergyContainerItem && input[1].hasTagCompound()) + if (input[1]!= null && input[1].getItem()!= null && input[1].getItem() instanceof IEnergyContainerItem && input[1].hasTagCompound()) charge = input[1].getTagCompound().getInteger("Energy"); tags.setInteger("Energy", charge); tags.setInteger(key, 1); From 7c26b9aee933fd584cf7867268e8a44927221452 Mon Sep 17 00:00:00 2001 From: progwml6 Date: Sun, 17 Nov 2013 03:47:55 -0500 Subject: [PATCH 4/4] 2nd npe fix --- src/tconstruct/modifiers/ModFlux.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tconstruct/modifiers/ModFlux.java b/src/tconstruct/modifiers/ModFlux.java index a7379e7f..757990bc 100644 --- a/src/tconstruct/modifiers/ModFlux.java +++ b/src/tconstruct/modifiers/ModFlux.java @@ -43,10 +43,6 @@ public class ModFlux extends ModBoolean for (ItemStack stack : batteries) { - if (stack.itemID == input[0].itemID && input[0].getItem() instanceof IEnergyContainerItem) - { - battery = true; - } if (stack.itemID == input[1].itemID && input[1].getItem() instanceof IEnergyContainerItem) { battery = true;