From af0fde5a27ba28b744d56085e1399ed95d4c5ee9 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 1 Dec 2016 02:07:37 +1000 Subject: + Basic Fire Maker. (1/4 change to light a fire, can also set you on fire if it fails) + Maceration recipes for the non-TC shards into non-TC shard dust. (Which GT then oreDicts into it's own, for making Energy Crystal) + Recipes for the Multi-tank Controller and it's frame blocks. (Fixes #40) + 4 new pipe types. Now there are 5 sizes of Tungsten, Dark Steel, Lead and Clay. - Hydrogen Blobs no longer get registered as dustHydrogen. (Broke many things without intention) $ Hopefully made a fix to the Multi-Tank, where it would reset it's storage multiplier to 0 or 1 when a world reloaded. % Enabled a previously disabled logging feature. + Put extra logging into getItemStackOfAmountFromOreDictNoBroken() during debug mode. $ Cleaned up ReflectionUtils.java and added a new method getMethodName() which will show where a method was called from. --- .../machines/multi/GregtechMetaTileEntity_MultiTank.java | 16 ++++++++++++---- .../gregtech/registration/gregtech/GregtechConduits.java | 5 +++++ 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java index 810ff85382..dbf6569156 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java @@ -104,7 +104,15 @@ extends GregtechMeta_MultiBlockBase { private short getStorageMultiplier(){ int tempstorageMultiplier = (1*multiblockCasingCount); if (tempstorageMultiplier <= 0){ - Utils.LOG_INFO("Invalid Storage Multiplier. "+multiblockCasingCount); + if (this != null){ + if (this.getBaseMetaTileEntity() != null){ + if (this.getBaseMetaTileEntity().getWorld() != null){ + Utils.LOG_INFO("Invalid Storage Multiplier. "+multiblockCasingCount); + checkMachine(this.getBaseMetaTileEntity(), null); + return 0; + } + } + } return 1; } return (short) tempstorageMultiplier; @@ -170,8 +178,8 @@ extends GregtechMeta_MultiBlockBase { "1x Output hatch (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", - "Multitank Exterior Casings for the rest (16 at least!)", - "Stored Fluid: "+fluidStored}; + "Multitank Exterior Casings for the rest (16 at least!)" + }; } @Override @@ -298,7 +306,7 @@ extends GregtechMeta_MultiBlockBase { Utils.LOG_WARNING("Internal Tank is empty, sitting idle."); return false; } - + if (mOutputHatches.get(0).mFluid == null || mOutputHatches.isEmpty() || (mOutputHatches.get(0).mFluid.isFluidEqual(internalStorageTank) && mOutputHatches.get(0).mFluid.amount < mOutputHatches.get(0).getCapacity())){ Utils.LOG_WARNING("Okay - 3"); int tempCurrentStored = internalStorageTank.amount; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 6f00eeeda5..118d6083c0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -74,6 +74,11 @@ public class GregtechConduits { generateNonGTFluidPipes(GT_Materials.Inconel690, ALLOY.INCONEL_690, BasePipeID+40, 7500, 4800, true); generateNonGTFluidPipes(GT_Materials.Inconel792, ALLOY.INCONEL_792, BasePipeID+45, 8000, 5500, true); generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, BasePipeID+50, 10000, 4200, true); + + generateGTFluidPipes(Materials.Tungsten, BasePipeID+55, 4320, 7200, true); + generateGTFluidPipes(Materials.DarkSteel, BasePipeID+60, 2320, 2750, true); + generateGTFluidPipes(Materials.Clay, BasePipeID+65, 75, 500, false); + generateGTFluidPipes(Materials.Lead, BasePipeID+70, 720, 1200, true); } private static void wireFactory(String Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){ -- cgit