1 files changed, 0 insertions, 43 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java
index f0a6dae8e5..5a017fd590 100644
--- a/src/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -2,16 +2,12 @@ package gregtech.api.objects;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import java.util.WeakHashMap;
 
-import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
 
 /**
  * Because Forge fucked this one up royally.
@@ -20,7 +16,6 @@ public class GT_FluidStack extends FluidStack {
 
     private static final Collection<GT_FluidStack> sAllFluidStacks = Collections
         .newSetFromMap(new WeakHashMap<>(10000));
-    private static volatile boolean lock = false;
     private final Fluid mFluid;
 
     public GT_FluidStack(Fluid aFluid, int aAmount) {
@@ -35,46 +30,8 @@ public class GT_FluidStack extends FluidStack {
         this(aFluid.getFluid(), aFluid.amount);
     }
 
-    public static final synchronized void fixAllThoseFuckingFluidIDs() {
-        if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) {
-            try {
-                while (lock) {
-                    Thread.sleep(1);
-                }
-            } catch (InterruptedException e) {}
-            lock = true;
-            for (GT_FluidStack tFluid : sAllFluidStacks) tFluid.fixFluidIDForFucksSake();
-            try {
-                for (Map<Fluid, ?> tMap : GregTech_API.sFluidMappings) GT_Utility.reMap(tMap);
-            } catch (Throwable e) {
-                e.printStackTrace(GT_Log.err);
-            }
-            lock = false;
-        }
-    }
-
-    public final void fixFluidIDForFucksSake() {
-        if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) {
-            int fluidID;
-            try {
-                fluidID = this.getFluid()
-                    .getID();
-            } catch (Throwable e) {
-                System.err.println(e);
-            }
-            try {
-                fluidID = mFluid.getID();
-            } catch (Throwable e) {
-                fluidID = -1;
-            }
-        }
-    }
-
     @Override
     public FluidStack copy() {
-        if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) {
-            fixFluidIDForFucksSake();
-        }
         return new GT_FluidStack(this);
     }