Merge pull request #53 from asdflj/super_speed_card

add super speed card support
GTNewHorizons · Jan 3, 2023 · 80f07a4 · 80f07a4
2 parents 8654ce8 + 42c47a3
commit 80f07a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,7 +2,7 @@
 
 dependencies {
     compile('com.github.GTNewHorizons:NotEnoughItems:2.3.10-GTNH:dev')
-    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-127-GTNH:dev')
+    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-133-GTNH:dev')
     compile('curse.maven:cofh-core-69162:2388751')
     compile('com.github.GTNewHorizons:waila:1.5.22:dev')
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false }

diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java
@@ -85,6 +85,8 @@ public static void postInit(FMLPostInitializationEvent event) {
             Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 1);
             Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 4);
             Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 4);
+            Upgrades.SUPERSPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 4);
+            Upgrades.SUPERSPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 4);
             Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1);
         }
 

diff --git a/src/main/java/com/glodblock/github/common/parts/PartSharedFluidBus.java b/src/main/java/com/glodblock/github/common/parts/PartSharedFluidBus.java
@@ -115,10 +115,18 @@ public int calculateAmountToSend() {
                 amount = amount * 4;
             case 1:
                 amount = amount * 8;
-            case 0:
-            default:
-                return (int) Math.floor(amount);
         }
+        switch (this.getInstalledUpgrades(Upgrades.SUPERSPEED)) {
+            case 4:
+                amount = amount * 8;
+            case 3:
+                amount = amount * 12;
+            case 2:
+                amount = amount * 16;
+            case 1:
+                amount = amount * 32;
+        }
+        return (int) Math.floor(amount);
     }
 
     @Override