diff options
Diffstat (limited to 'main/java/gregtech')
103 files changed, 3854 insertions, 4542 deletions
diff --git a/main/java/gregtech/api/objects/GT_FluidStack.java b/main/java/gregtech/api/objects/GT_FluidStack.java index 96b1517e9b..12735101ca 100644 --- a/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/main/java/gregtech/api/objects/GT_FluidStack.java @@ -29,18 +29,18 @@ public class GT_FluidStack extends FluidStack { } public static void fixAllThoseFuckingFluidIDs() { - //for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); - //for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); + for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) try {GT_Utility.reMap(tMap);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} } public void fixFluidIDForFucksSake() { - //int fluidID = this.getFluidID(); - //try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} + int fluidID = this.getFluid().getID(); + try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;} } @Override public FluidStack copy() { - //fixFluidIDForFucksSake(); + fixFluidIDForFucksSake(); return new GT_FluidStack(this); } }
\ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Ores.java b/main/java/gregtech/common/blocks/GT_Block_Ores.ja |