diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-07 20:15:01 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-07 20:15:01 +1000 |
| commit | 1cb08313232fe112ceaa4036da8b057d7ee9209f (patch) | |
| tree | 6fac6e504f19fe1c5ee89ea11cae10f61a040c71 /src/Java/gtPlusPlus/xmod/gregtech | |
| parent | ed3d0de32f9cdf7294814346b9cfabb5a725087a (diff) | |
| download | GT5-Unofficial-1cb08313232fe112ceaa4036da8b057d7ee9209f.tar.gz GT5-Unofficial-1cb08313232fe112ceaa4036da8b057d7ee9209f.tar.bz2 GT5-Unofficial-1cb08313232fe112ceaa4036da8b057d7ee9209f.zip | |
$ Fixed Shapeless recipes not working.
% Tweaked Cost of custom pipes in the extruder. Fixes #67.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 9fd4eedaa7..93fb07d4ba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -58,7 +58,8 @@ public class GregtechConduits { superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8); if (LoadedMods.Thaumcraft){ - superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8);} + superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8); + } @@ -70,7 +71,8 @@ public class GregtechConduits { generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID+5, 5000, 4250, true); generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, BasePipeID+10, 6000, 5800, true); if (LoadedMods.Thaumcraft){ - generateNonGTFluidPipes(GT_Materials.Void, null, BasePipeID+15, 250, 25000, true);} + generateNonGTFluidPipes(GT_Materials.Void, null, BasePipeID+15, 250, 25000, true); + } generateGTFluidPipes(Materials.Europium, BasePipeID+20, 12000, 7500, true); generateNonGTFluidPipes(GT_Materials.Potin, ALLOY.POTIN, BasePipeID+25, 375, 2000, true); generateNonGTFluidPipes(GT_Materials.MaragingSteel300, ALLOY.MARAGING300, BasePipeID+30, 7000, 2500, true); @@ -205,7 +207,7 @@ public class GregtechConduits { private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof){ final int transferRatePerTick = transferRatePerSec/20; final long mass = material.getMass(); - final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16; + final long voltage = material.mMeltingPoint >= 2800 ? 60 : 15; GT_OreDictUnificator.registerOre(OrePrefixes.pipeTiny.get(material), new GT_MetaPipeEntity_Fluid(startID, "GT_Pipe_"+material.mDefaultLocalName+"_Tiny", "Tiny "+material.mDefaultLocalName+" Fluid Pipe", 0.25F, material, transferRatePerTick*2, heatResistance, isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(material), new GT_MetaPipeEntity_Fluid(startID+1, "GT_Pipe_"+material.mDefaultLocalName+"_Small", "Small "+material.mDefaultLocalName+" Fluid Pipe", 0.375F, material, transferRatePerTick*4, heatResistance, isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.pipeMedium.get(material), new GT_MetaPipeEntity_Fluid(startID+2, "GT_Pipe_"+material.mDefaultLocalName+"", ""+material.mDefaultLocalName+" Fluid Pipe", 0.5F, material, transferRatePerTick*6, heatResistance, isGasProof).getStackForm(1L)); @@ -266,7 +268,7 @@ public class GregtechConduits { Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false)); Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false)); - int eut = 128; + int eut = 120; int time = 0; final int bonusMulti = 5*20; @@ -348,4 +350,4 @@ public class GregtechConduits { } return ItemUtils.getSimpleStack(ModItems.AAA_Broken, amount); } -} +}
\ No newline at end of file |