Implement working amps to remove the hack (#494)

* Implement working amps to remove the hack

* Use long base function instead of helper

* Updated dep

* Also yeet hack from QFT

4 files changed, 16 insertions, 15 deletions

diff --git a/build.gradle b/build.gradle
index fa88ae1be7..2dc32c9f20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1671313514
+//version: 1673027205
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -46,7 +46,7 @@ buildscript {
     }
     dependencies {
         //Overwrite the current ASM version to fix shading newer than java 8 applicatations.
-        classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3'  
+        classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3'
         classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13'
     }
 }
@@ -319,9 +319,13 @@ if (file('addon.gradle').exists()) {
 apply from: 'repositories.gradle'
 
 configurations {
-    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
-    implementation.extendsFrom(shadowCompile)
-    implementation.extendsFrom(shadeCompile)
+    // TODO: remove Compile after all uses are refactored to Implementation
+    for (config in [shadowImplementation, shadowCompile, shadeCompile]) {
+        compileClasspath.extendsFrom(config)
+        runtimeClasspath.extendsFrom(config)
+        testCompileClasspath.extendsFrom(config)
+        testRuntimeClasspath.extendsFrom(config)
+    }
 }
 
 repositories {
@@ -350,7 +354,8 @@ dependencies {
         annotationProcessor('com.google.code.gson:gson:2.8.6')
         annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor')
         if (usesMixinDebug.toBoolean()) {
-            runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
+            runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
+            testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
         }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
diff --git a/dependencies.gradle b/dependencies.gradle
index 315ed07515..31ad15cc9c 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.208:dev')
+    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.214:dev')
     compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev")
     compile("com.github.GTNewHorizons:ModularUI:1.0.38:dev") {transitive=false}
     compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev")
@@ -26,7 +26,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:Chisel:2.10.15-GTNH:dev') {transitive=false}
     compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {transitive = false}
 
-    compile("com.github.GTNewHorizons:TecTech:5.0.69:dev")
+    compile("com.github.GTNewHorizons:TecTech:5.0.72:dev")
 
     runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
index 1b300b26b0..2f06dafaad 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java
@@ -717,8 +717,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer
             ItemStack[] aItemInputs, FluidStack[] aFluidInputs, GT_Recipe.GT_Recipe_Map aRecipeMap, ItemStack aStack) {
         int hatches = getExoticAndNormalEnergyHatchList().size();
         long tVoltage = getMaxInputVoltage() / hatches;
-        // Need to check weather the hatches used are TT ones or not as TT hatches can request 20% more amps
-        long tAmps = (long) Math.floor(mExoticEnergyHatches.isEmpty() ? getMaxInputAmps() : getMaxInputAmps() * 0.80);
+        long tAmps = getMaxInputAmps();
         long tTotalEUt = tVoltage * tAmps;
         byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
         GT_Recipe tRecipe = aRecipeMap
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
index 2da3fc6acf..a173ca4c36 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java
@@ -363,9 +363,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
         if (tItems.length <= 0 && tFluids.length <= 0) return false;
         long tVoltage = this.getMaxInputVoltage()
                 / this.getExoticAndNormalEnergyHatchList().size();
-        long tAmps = (long) (GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(this.getExoticEnergyHatches()) * 0.8D
-                + GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(
-                        this.mEnergyHatches)); // Use 80% of the available amps for exotic hatches to get working amps
+        long tAmps = this.getMaxInputAmps();
         long tTotalEU = tVoltage * tAmps;
 
         GT_Recipe recipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, tTotalEU, tFluids, tItems);
@@ -537,8 +535,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter
                     + GT_Utility.formatNumbers(
                             GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()))
                     + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW
-                    + GT_Utility.formatNumbers(
-                            GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList()))
+                    + GT_Utility.formatNumbers(this.getMaxInputAmps())
                     + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier")
                     + ": " + EnumChatFormatting.YELLOW
                     + GT_Values.VN[