Fix mining module drone stocking exploit (#105)

GTNewHorizons · Jan 17, 2025 · ccfc2e3 · ccfc2e3
1 parent c7dbb6c
commit ccfc2e3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleMiner.java b/...com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleMiner.java
@@ -47,13 +47,15 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ggfab.mte.MTELinkedInputBus;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider;
+import gregtech.api.metatileentity.implementations.MTEHatchInputBus;
 import gregtech.api.objects.XSTR;
 import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.RecipeMap;
@@ -67,6 +69,7 @@
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 import gregtech.common.misc.spaceprojects.enums.SolarSystem;
 import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
+import gregtech.common.tileentities.machines.MTEHatchInputBusME;
 import gtPlusPlus.core.material.MaterialsElements;
 import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
 import tectech.TecTech;
@@ -281,13 +284,16 @@ public RecipeMap<?> getRecipeMap() {
             return SimpleCheckRecipeResult.ofFailure("no_plasma");
         }
 
+        // Check for valid item inputs
+        ItemStack[] itemInputs = validInputs();
+
         // Look for a valid plasma to start a mining operation
         for (FluidStack fluidStack : inputFluids) {
             int availablePlasmaTier = getTierFromPlasma(fluidStack);
             if (availablePlasmaTier > 0) {
                 // Check if valid inputs for a mining operation are present
                 CheckRecipeResult result = process(
-                        getStoredInputs().toArray(new ItemStack[0]),
+                        itemInputs,
                         inputFluids.toArray(new FluidStack[0]),
                         availablePlasmaTier,
                         fluidStack,
@@ -302,6 +308,20 @@ public RecipeMap<?> getRecipeMap() {
         return CheckRecipeResultRegistry.NO_RECIPE;
     }
 
+    /** Determine which drones and items are in the correct buses */
+    protected ItemStack[] validInputs() {
+        ArrayList<ItemStack> validatedInputs = new ArrayList<>();
+        for (MTEHatchInputBus inputBus : mInputBusses) {
+            ArrayList<ItemStack> busItems = new ArrayList<>(Arrays.asList(inputBus.getRealInventory()));
+            // No drone sharing
+            if (inputBus instanceof MTEHatchInputBusME || inputBus instanceof MTELinkedInputBus) {
+                busItems.removeIf(item -> item != null && item.getItem() instanceof ItemMiningDrones);
+            }
+            validatedInputs.addAll(busItems);
+        }
+        return validatedInputs.toArray(new ItemStack[0]);
+    }
+
     /**
      * Try to process the input resources
      *
@@ -453,6 +473,7 @@ protected int getAvailDroneMask(ItemStack[] inputs) {
         for (ItemStack input : inputs) {
             // XXX: all space mining recipes are nbt insensitive, but if this ever changes, we would need to compare
             // items including nbt
+            if (input == null) continue;
             GTUtility.ItemId key = GTUtility.ItemId.createWithoutNBT(input);
             itemCounts.merge(key, (long) input.stackSize, Long::sum);
         }
@@ -997,6 +1018,7 @@ protected MultiblockTooltipBuilder createTooltip() {
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5"))
+                    .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.desc5"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6"))
@@ -1094,6 +1116,7 @@ protected MultiblockTooltipBuilder createTooltip() {
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5"))
+                    .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.desc5"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6"))
@@ -1191,6 +1214,7 @@ protected MultiblockTooltipBuilder createTooltip() {
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5"))
+                    .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.desc5"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3"))
                     .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6"))

diff --git a/src/main/resources/assets/gtnhintergalactic/lang/en_US.lang b/src/main/resources/assets/gtnhintergalactic/lang/en_US.lang
@@ -278,6 +278,7 @@ gt.blockmachines.multimachine.project.ig.miner.t3.desc1=This definitely violates
 gt.blockmachines.multimachine.project.ig.miner.desc3=Requires a plasma to operate (825L Helium / 550L Bismuth / 375L Radon / 250L Technetium / 150L Plutonium 241).
 gt.blockmachines.multimachine.project.ig.miner.desc4=Higher tier plasmas increases the chances of mining bigger asteroids, and improves mining operation time.
 gt.blockmachines.multimachine.project.ig.miner.desc5=Needs to be fed with computation to work.
+gt.blockmachines.multimachine.project.ig.miner.desc5.1=Mining Drones must be placed in a regular input bus (neither linked nor stocking bus).
 gt.blockmachines.multimachine.project.ig.miner.t1.desc5=Runs at UV with up to 2 parallels
 gt.blockmachines.multimachine.project.ig.miner.t2.desc5=Runs at UHV with up to 4 parallels
 gt.blockmachines.multimachine.project.ig.miner.t3.desc5=Runs at UEV with up to 8 parallels