More updates.

Many bugfixes + 5 Tier Pump + API.jar

1 files changed, 12 insertions, 3 deletions

diff --git a/main/java/gregtech/api/objects/GT_FluidStack.java b/main/java/gregtech/api/objects/GT_FluidStack.java
index 12735101ca..ac54003d35 100644
--- a/main/java/gregtech/api/objects/GT_FluidStack.java
+++ b/main/java/gregtech/api/objects/GT_FluidStack.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
+import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -17,6 +18,7 @@ import net.minecraftforge.fluids.FluidStack;
 public class GT_FluidStack extends FluidStack {
 	private static final Collection<GT_FluidStack> sAllFluidStacks = new ArrayList<GT_FluidStack>(5000);
 	private Fluid mFluid;
+	private static boolean lock=false; 
 	
     public GT_FluidStack(Fluid aFluid, int aAmount) {
     	super(aFluid, aAmount);
@@ -29,18 +31,25 @@ public class GT_FluidStack extends FluidStack {
     }
     
     public static void fixAllThoseFuckingFluidIDs() {
+    	if(ForgeVersion.getBuildVersion()<1355){
+    	while(lock){try {Thread.sleep(1);} catch (InterruptedException e) {}}
+    	lock=true;
     	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);}
+    	lock=false;}
 	}
     
     public void fixFluidIDForFucksSake() {
-    	int fluidID = this.getFluid().getID();
-    	try {fluidID = mFluid.getID();} catch(Throwable e) {fluidID = -1;}
+    	if(ForgeVersion.getBuildVersion()<1355){
+    	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() {
-    	fixFluidIDForFucksSake();
+    	if(ForgeVersion.getBuildVersion()<1355){
+    	fixFluidIDForFucksSake();}
         return new GT_FluidStack(this);
     }
 }
\ No newline at end of file