Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp

1 files changed, 11 insertions, 15 deletions

diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index 3f9e52818c..6ff1627ab7 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -29,28 +29,24 @@ public class GT_FluidStack extends FluidStack {
         this(aFluid.getFluid(), aFluid.amount);
     }
 
-    public static synchronized void fixAllThoseFuckingFluidIDs() {
-        if (ForgeVersion.getBuildVersion() < 1355) {
-            while (lock) {
-                try {
+    public static final synchronized void fixAllThoseFuckingFluidIDs() {
+        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 void fixFluidIDForFucksSake() {
-        if (ForgeVersion.getBuildVersion() < 1355) {
+    public final void fixFluidIDForFucksSake() {
+        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);