diff options
author | Muramasa <haydenkilloh@gmail.com> | 2016-08-13 10:10:11 +0100 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2016-09-22 19:26:18 +0200 |
commit | 4378d8c6732357c7f175c0990fbf7c461761bc9a (patch) | |
tree | 9da77710496c5520b50be2d95b10ae4f3ff0419c /src/main/java/gregtech/api/objects | |
parent | 04fec51acb0f1053dfea595c04ea0862da1d4f37 (diff) | |
download | GT5-Unofficial-4378d8c6732357c7f175c0990fbf7c461761bc9a.tar.gz GT5-Unofficial-4378d8c6732357c7f175c0990fbf7c461761bc9a.tar.bz2 GT5-Unofficial-4378d8c6732357c7f175c0990fbf7c461761bc9a.zip |
Try Catch Changes
Diffstat (limited to 'src/main/java/gregtech/api/objects')
-rw-r--r-- | src/main/java/gregtech/api/objects/GT_FluidStack.java | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java index d2fdbbfb47..6ff1627ab7 100644 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java @@ -30,27 +30,23 @@ public class GT_FluidStack extends FluidStack { } public static final synchronized void fixAllThoseFuckingFluidIDs() { - if (ForgeVersion.getBuildVersion() < 1355) { - while (lock) { - try { + if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) { + try { + while (lock) { Thread.sleep(1); - } catch (InterruptedException e) { - } - } + }} catch (InterruptedException e) {} lock = true; for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake(); - for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) - try { + try { + for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) GT_Utility.reMap(tMap); - } catch (Throwable e) { - e.printStackTrace(GT_Log.err); - } + } catch (Throwable e) {e.printStackTrace(GT_Log.err);} lock = false; } } public final void fixFluidIDForFucksSake() { - if (ForgeVersion.getBuildVersion() < 1355) { + if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) { int fluidID; try { fluidID = this.getFluid().getID(); @@ -67,7 +63,7 @@ public class GT_FluidStack extends FluidStack { @Override public FluidStack copy() { - if (ForgeVersion.getBuildVersion() < 1355) { + if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) { fixFluidIDForFucksSake(); } return new GT_FluidStack(this); |