From 6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2 Mon Sep 17 00:00:00 2001
From: Muramasa <haydenkilloh@gmail.com>
Date: Fri, 16 Sep 2016 00:17:08 +0100
Subject: Fix conflicts

---
 .../java/gregtech/api/objects/GT_FluidStack.java   | 26 +++++++++-------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/main/java/gregtech/api/objects')

diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index bc1dd8f077..f4aad8ed5e 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -29,29 +29,25 @@ 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;
         }
     }
 
     @Deprecated
-    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();
@@ -68,7 +64,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);
-- 
cgit