From 238d858735917e10e59dac5f0bfcc45450afc8e6 Mon Sep 17 00:00:00 2001
From: Demonic <admin@Demonly.net>
Date: Sat, 29 Aug 2020 15:18:12 -0400
Subject: [PATCH] Fix gas terminal displaying incorrect amount, fix build error
 due to waila change

---
 build.gradle                                  |  4 +-
 build.properties                              |  2 +-
 .../integration/mekanism/gas/GasList.java     | 39 ++++++++++---------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index 723f5d590..251348aad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,7 @@ repositories {
 	
 	maven {
 		name = "tehnut"
-		url = "https://tehnut.info/maven"
+		url = "https://maven.tehnut.info"
 	}
 	
 	maven {
@@ -111,7 +111,7 @@ dependencies {
     //    transitive = false
 	//}
 	
-	deobfCompile ("mcp.mobius.waila:Hwyla:${config.version.waila}") {
+	compileOnly ("mcp.mobius.waila:Hwyla:${config.version.waila}:api") {
 		transitive = false
 	}
 	
diff --git a/build.properties b/build.properties
index 3ad16f96e..65a93bb3f 100644
--- a/build.properties
+++ b/build.properties
@@ -10,7 +10,7 @@ version.ae=rv6-stable-6
 version.oc=MC1.12.2-1.7.+
 version.baubles=1.5.2
 version.bc=7.99.15
-version.waila=1.8.25-B40_1.12
+version.waila=1.8.26-B41_1.12.2
 version.jei=4.14.3.238
 version.me=1.12.2:9.4.6.341
 version.pl=1.12.2-2.2.151
diff --git a/src/main/scala/extracells/integration/mekanism/gas/GasList.java b/src/main/scala/extracells/integration/mekanism/gas/GasList.java
index 0eaa92f1b..e96b1467e 100644
--- a/src/main/scala/extracells/integration/mekanism/gas/GasList.java
+++ b/src/main/scala/extracells/integration/mekanism/gas/GasList.java
@@ -19,9 +19,10 @@ public void addStorage(IAEGasStack iaeGasStack) {
         if (stack != null){
             stack.add(iaeGasStack);
             return;
-        }
-        IAEGasStack toAdd = iaeGasStack.copy();
-        this.putGasRecord(toAdd);
+        } else {
+			IAEGasStack toAdd = iaeGasStack.copy();
+			this.putGasRecord(toAdd);
+		}
     }
 
     @Override
@@ -35,13 +36,13 @@ public void addCrafting(IAEGasStack iaeGasStack) {
         {
             stack.setCraftable(true);
             return;
-        }
+        } else {
+			IAEGasStack toAdd = iaeGasStack.copy();
+			toAdd.setStackSize(0);
+			toAdd.setCraftable(true);
 
-        IAEGasStack toAdd = iaeGasStack.copy();
-        toAdd.setStackSize(0);
-        toAdd.setCraftable(true);
-
-        this.putGasRecord(toAdd);
+			this.putGasRecord(toAdd);
+		}
     }
 
     @Override
@@ -55,14 +56,15 @@ public void addRequestable(IAEGasStack iaeGasStack) {
         {
             stack.setCountRequestable(stack.getCountRequestable() + iaeGasStack.getCountRequestable());
             return;
-        }
+        } else {
 
-        IAEGasStack toAdd = iaeGasStack.copy();
-        toAdd.setStackSize(0);
-        toAdd.setCraftable(false);
-        toAdd.setCountRequestable(iaeGasStack.getCountRequestable());
+			IAEGasStack toAdd = iaeGasStack.copy();
+			toAdd.setStackSize(0);
+			toAdd.setCraftable(false);
+			toAdd.setCountRequestable(iaeGasStack.getCountRequestable());
 
-        this.putGasRecord(toAdd);
+			this.putGasRecord(toAdd);
+		}
     }
 
     @Override
@@ -96,9 +98,10 @@ public void add(IAEGasStack iaeGasStack) {
         IAEGasStack stack = this.getGasRecord(iaeGasStack);
         if (stack != null){
             stack.add(iaeGasStack);
-        }
-        IAEGasStack toAdd = iaeGasStack.copy();
-        this.putGasRecord(toAdd);
+        } else {
+			IAEGasStack toAdd = iaeGasStack.copy();
+			this.putGasRecord(toAdd);
+		}
     }
 
     @Override