From 9e0e16db799d67b85da5e49533f3f5290bcb10f0 Mon Sep 17 00:00:00 2001
From: Sampsa <69092953+S4mpsa@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:24:06 +0300
Subject: More antimatter fixes (#3176)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../goodgenerator/blocks/tileEntity/AntimatterForge.java | 16 +++++++++++-----
 .../blocks/tileEntity/AntimatterGenerator.java           | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'src/main/java/goodgenerator')

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java
index 4bf48910e8..8f5b522d3c 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java
@@ -142,7 +142,7 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo
                             .anyOf(HatchElement.Energy.or(HatchElement.ExoticEnergy))
                             .adder(AntimatterForge::addEnergyInjector)
                             .casingIndex(x.textureIndex(2))
-                            .dot(4)
+                            .dot(2)
                             .buildAndChain(x.getCasingBlock(2), x.getCasingMeta(2))))
                 .build();
         }
@@ -298,8 +298,14 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo
                     + "+0.10"
                     + EnumChatFormatting.GRAY)
             .addSeparator()
-            .addEnergyHatch("1-9, Hint block with dot 4", 4)
+            .addSeparator()
+            .addCasingInfoMin("Antimatter Containment Casing", 512, false)
+            .addCasingInfoMin("Magnetic Flux Casing", 2274, false)
+            .addCasingInfoMin("Gravity Stabilization Casing", 623, false)
+            .addCasingInfoMin("Protomatter Activation Coil", 126, false)
             .addInputHatch("1-6, Hint block with dot 1", 1)
+            .addEnergyHatch("1-9, Hint block with dot 2", 2)
+            .addOtherStructurePart("Antimatter Hatch", "16, Hint Block with dot 3", 3)
             .toolTipFinisher("Good Generator");
         return tt;
     }
@@ -458,9 +464,9 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo
         return antimatterStored;
     }
 
-    private void setModifiers(FluidStack inputFluid, float step, FluidStack[] upgradeFluids, int upgradeId) {
-        for (int tier = 1; tier <= upgradeFluids.length; tier++) {
-            if (inputFluid.isFluidEqual(upgradeFluids[tier - 1])) {
+    private void setModifiers(FluidStack inputFluid, float step, FluidStack[] fluidArray, int upgradeId) {
+        for (int tier = 1; tier <= fluidArray.length; tier++) {
+            if (inputFluid.isFluidEqual(fluidArray[tier - 1])) {
                 if (inputFluid.amount >= fluidConsumptions[upgradeId]) {
                     modifiers[upgradeId] = step * tier;
                     upgradeFluids[upgradeId] = inputFluid;
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java
index 89bb56acdd..0d3c427ccb 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java
@@ -98,14 +98,14 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase
                             .anyOf(HatchElement.ExoticEnergy)
                             .adder(AntimatterGenerator::addLaserSource)
                             .casingIndex(x.textureIndex(2))
-                            .dot(1)
+                            .dot(2)
                             .buildAndChain(x.getCasingBlock(2), x.getCasingMeta(2))))
                 .addElement(
                     'I',
                     lazy(
                         x -> buildHatchAdder(AntimatterGenerator.class).atLeast(HatchElement.InputHatch)
                             .casingIndex(x.textureIndex(1))
-                            .dot(2)
+                            .dot(1)
                             .buildAndChain(x.getCasingBlock(1), x.getCasingMeta(1))))
                 .build();
         }
@@ -338,8 +338,16 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase
             .addInfo("Enable wireless EU mode with screwdriver")
             .addInfo("Wireless mode requires SC UMV Base or better")
             .addInfo("Wireless mode uses hatch capacity limit")
-            .addDynamoHatch("1-9, Hint block with dot 4", 4)
-            .addInputHatch("1-6, Hint block with dot 1", 1)
+            .addSeparator()
+            .addCasingInfoMin("Transcendentally Reinforced Borosilicate Glass", 1008, false)
+            .addCasingInfoMin("Magnetic Flux Casing", 4122, false)
+            .addCasingInfoMin("Gravity Stabilization Casing", 2418, false)
+            .addCasingInfoMin("Protomatter Activation Coil", 32, false)
+            .addCasingInfoMin("Antimatter Annihilation Matrix", 600, false)
+            .addCasingInfoMin("Naquadria Frame Box", 293, false)
+            .addCasingInfoMin("Advanced Filter Casing", 209, false)
+            .addInputHatch("2, Hint block with dot 1", 1)
+            .addOtherStructurePart("Laser Source Hatch", "1-64, Hint Block with dot 2", 2)
             .toolTipFinisher("Good Generator");
         return tt;
     }
-- 
cgit