Move any mekanism related functions to dedicated classes to prevent class loading errors in runtime

Updated gradle

Author: SirEndii

CHANGELOG.md

@@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.21.1-0.7.50b] - 2025-06-10
+
 The new ME and RS Bridge system are more or less final, but expect any last-minute changes before the final release. We will listen for any feedback and try to improve the system as much as we can!
 If there are any inconsistencies or bugs, please report them at our github!
 

build.gradle

@@ -225,26 +225,31 @@ dependencies {
     // Minimal requirements end
 
     compileOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}")
-    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}")
+    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}") {
+        transitive = false
+    }
 
+    // Transitive prevents that this dependency would load other dependencies which are used by refined storage and are faulty marked
     compileOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")
-    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")
+    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")  {
+            transitive = false
+    }
 
     // Needed for the refined storage mek integration
-    compileOnlyApi("dev.emi:emi-neoforge:${emiVersion}")
+    //compileOnlyApi("dev.emi:emi-neoforge:${emiVersion}")
 
     // Extended requirements
     // We don't use the api since we need a specific class from mekanism
     compileOnly "mekanism:Mekanism:${mekanism_version}"
-    //runtimeOnly "mekanism:Mekanism:${mekanism_version}"
+    runtimeOnly "mekanism:Mekanism:${mekanism_version}"
 
     // Applied Energistics 2
     compileOnly "org.appliedenergistics:appliedenergistics2:${appliedenergistics_version}"
     runtimeOnly "org.appliedenergistics:appliedenergistics2:${appliedenergistics_version}"
 
     // Applied Mekanistics
     compileOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
-    //runtimeOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
+    runtimeOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
 
     // AE2 Things
     compileOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AEMekanismApi.java

@@ -0,0 +1,84 @@
+package de.srendi.advancedperipherals.common.addons.appliedenergistics;
+
+import appeng.api.storage.MEStorage;
+import dan200.computercraft.api.lua.IArguments;
+import dan200.computercraft.api.lua.LuaException;
+import dan200.computercraft.api.lua.MethodResult;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.MEBridgePeripheral;
+import de.srendi.advancedperipherals.common.blocks.blockentities.MEBridgeEntity;
+import de.srendi.advancedperipherals.common.util.Pair;
+import de.srendi.advancedperipherals.common.util.StatusConstants;
+import de.srendi.advancedperipherals.common.util.inventory.ChemicalFilter;
+import de.srendi.advancedperipherals.common.util.inventory.ChemicalUtil;
+import mekanism.api.chemical.IChemicalHandler;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Offloading mekanism related ME Bridge functions to prevent class loading errors at runtime
+ */
+public class AEMekanismApi {
+
+    /**
+     * imports a fluid to the system from a valid tank
+     *
+     * @param arguments  the arguments given by the computer
+     * @param computer   the computer connected to the peripheral - used for peripheral attached inventories
+     * @param peripheral the ME Bridge peripheral
+     * @return the imported amount or null with a string if something went wrong
+     */
+    public static MethodResult importToME(@NotNull IArguments arguments, IComputerAccess computer, MEBridgePeripheral peripheral) throws LuaException {
+        MEBridgeEntity bridge = peripheral.getBridge();
+        MEStorage monitor = AEApi.getMonitor(bridge.getActionableNode());
+        Pair<ChemicalFilter, String> filter = ChemicalFilter.parse(arguments.getTable(0));
+
+        if (filter.rightPresent())
+            return MethodResult.of(0, filter.getRight());
+
+        String side = arguments.getString(1);
+        IChemicalHandler targetTank = ChemicalUtil.getHandlerFromDirection(side, peripheral.getPeripheralOwner());
+
+        if (targetTank == null) {
+            targetTank = ChemicalUtil.getHandlerFromName(computer, side);
+        }
+
+        if (targetTank == null)
+            return MethodResult.of(0, StatusConstants.INVENTORY_NOT_FOUND.name());
+
+        MEChemicalHandler chemicalHandler = new MEChemicalHandler(monitor, bridge);
+
+        return MethodResult.of(ChemicalUtil.moveChemical(targetTank, chemicalHandler, filter.getLeft()));
+    }
+
+    /**
+     * imports a fluid to the system from a valid tank
+     *
+     * @param arguments  the arguments given by the computer
+     * @param computer   the computer connected to the peripheral - used for peripheral attached inventories
+     * @param peripheral the ME Bridge peripheral
+     * @return the exportable amount or null with a string if something went wrong
+     */
+    public static MethodResult exportToTank(@NotNull IArguments arguments, IComputerAccess computer, MEBridgePeripheral peripheral) throws LuaException {
+        MEBridgeEntity bridge = peripheral.getBridge();
+        MEStorage monitor = AEApi.getMonitor(bridge.getActionableNode());
+        Pair<ChemicalFilter, String> filter = ChemicalFilter.parse(arguments.getTable(0));
+
+        if (filter.rightPresent())
+            return MethodResult.of(0, filter.getRight());
+
+        String side = arguments.getString(1);
+        IChemicalHandler targetTank = ChemicalUtil.getHandlerFromDirection(side, peripheral.getPeripheralOwner());
+
+        if (targetTank == null) {
+            targetTank = ChemicalUtil.getHandlerFromName(computer, side);
+        }
+
+        if (targetTank == null)
+            return MethodResult.of(0, StatusConstants.INVENTORY_NOT_FOUND.name());
+
+        MEChemicalHandler chemicalHandler = new MEChemicalHandler(monitor, bridge);
+
+        return MethodResult.of(ChemicalUtil.moveChemical(chemicalHandler, targetTank, filter.getLeft()));
+    }
+
+}

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MEBridgePeripheral.java

@@ -18,7 +18,7 @@
 import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.AEApi;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.AECraftJob;
-import de.srendi.advancedperipherals.common.addons.appliedenergistics.MEChemicalHandler;
+import de.srendi.advancedperipherals.common.addons.appliedenergistics.AEMekanismApi;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.MEFluidHandler;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.MEItemHandler;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.BlockEntityPeripheralOwner;
@@ -27,7 +27,6 @@
 import de.srendi.advancedperipherals.common.util.Pair;
 import de.srendi.advancedperipherals.common.util.StatusConstants;
 import de.srendi.advancedperipherals.common.util.inventory.ChemicalFilter;
-import de.srendi.advancedperipherals.common.util.inventory.ChemicalUtil;
 import de.srendi.advancedperipherals.common.util.inventory.FluidFilter;
 import de.srendi.advancedperipherals.common.util.inventory.FluidUtil;
 import de.srendi.advancedperipherals.common.util.inventory.GenericFilter;
@@ -36,7 +35,6 @@
 import de.srendi.advancedperipherals.common.util.inventory.ItemFilter;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
 import me.ramidzkh.mekae2.ae2.MekanismKey;
-import mekanism.api.chemical.IChemicalHandler;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.items.IItemHandler;
 import org.jetbrains.annotations.NotNull;
@@ -73,6 +71,10 @@ private ICraftingService getCraftingService() {
         return node.getGrid().getCraftingService();
     }
 
+    public MEBridgeEntity getBridge() {
+        return bridge;
+    }
+
     /**
      * exports an item out of the system to a valid inventory
      *
@@ -109,23 +111,6 @@ protected MethodResult exportToTank(@NotNull IArguments arguments, IFluidHandler
         return MethodResult.of(FluidUtil.moveFluid(fluidHandler, targetTank, filter.getLeft()), null);
     }
 
-    /**
-     * exports a fluid out of the system to a valid tank
-     *
-     * @param arguments  the arguments given by the computer
-     * @param targetTank the give tank
-     * @return the exportable amount or null with a string if something went wrong
-     */
-    protected MethodResult exportToTank(@NotNull IArguments arguments, IChemicalHandler targetTank) throws LuaException {
-        MEStorage monitor = AEApi.getMonitor(node);
-        MEChemicalHandler chemicalHandler = new MEChemicalHandler(monitor, bridge);
-        Pair<ChemicalFilter, String> filter = ChemicalFilter.parse(arguments.getTable(0));
-
-        if (filter.rightPresent())
-            return MethodResult.of(0, filter.getRight());
-
-        return MethodResult.of(ChemicalUtil.moveChemical(chemicalHandler, targetTank, filter.getLeft()));
-    }
 
     /**
      * imports an item to the system from a valid inventory
@@ -163,24 +148,6 @@ protected MethodResult importToME(@NotNull IArguments arguments, IFluidHandler t
         return MethodResult.of(FluidUtil.moveFluid(targetTank, fluidHandler, filter.getLeft()), null);
     }
 
-    /**
-     * imports a fluid to the system from a valid tank
-     *
-     * @param arguments  the arguments given by the computer
-     * @param targetTank the give tank
-     * @return the imported amount or null with a string if something went wrong
-     */
-    protected MethodResult importToME(@NotNull IArguments arguments, IChemicalHandler targetTank) throws LuaException {
-        MEStorage monitor = AEApi.getMonitor(node);
-        MEChemicalHandler chemicalHandler = new MEChemicalHandler(monitor, bridge);
-        Pair<ChemicalFilter, String> filter = ChemicalFilter.parse(arguments.getTable(0));
-
-        if (filter.rightPresent())
-            return MethodResult.of(0, filter.getRight());
-
-        return MethodResult.of(ChemicalUtil.moveChemical(targetTank, chemicalHandler, filter.getLeft()));
-    }
-
     private MethodResult notConnected(@Nullable Object defaultValue) {
         return MethodResult.of(defaultValue, StatusConstants.NOT_CONNECTED.toString());
     }
@@ -450,19 +417,9 @@ public MethodResult importChemical(IComputerAccess computer, IArguments argument
             return notConnected(0);
 
         if (!APAddon.APP_MEKANISTICS.isLoaded())
-            return MethodResult.of(0);
-
-        String side = arguments.getString(1);
-        IChemicalHandler chemicalHandler = ChemicalUtil.getHandlerFromDirection(side, owner);
-
-        if (chemicalHandler == null) {
-            chemicalHandler = ChemicalUtil.getHandlerFromName(computer, side);
-        }
-
-        if (chemicalHandler == null)
-            return MethodResult.of(0, StatusConstants.INVENTORY_NOT_FOUND.name());
+            return MethodResult.of(null, StatusConstants.ADDON_NOT_LOADED.withInfo(APAddon.APP_MEKANISTICS.name()));
 
-        return importToME(arguments, chemicalHandler);
+        return AEMekanismApi.importToME(arguments, computer, this);
     }
 
     @Override
@@ -471,20 +428,10 @@ public MethodResult exportChemical(IComputerAccess computer, IArguments argument
         if (!isAvailable())
             return notConnected(0);
 
-        if (APAddon.APP_MEKANISTICS.isLoaded())
-            return MethodResult.of(0);
-
-        String side = arguments.getString(1);
-        IChemicalHandler chemicalHandler = ChemicalUtil.getHandlerFromDirection(side, owner);
-
-        if (chemicalHandler == null) {
-            chemicalHandler = ChemicalUtil.getHandlerFromName(computer, side);
-        }
-
-        if (chemicalHandler == null)
-            return MethodResult.of(0, StatusConstants.INVENTORY_NOT_FOUND.name());
+        if (!APAddon.APP_MEKANISTICS.isLoaded())
+            return MethodResult.of(null, StatusConstants.ADDON_NOT_LOADED.withInfo(APAddon.APP_MEKANISTICS.name()));
 
-        return exportToTank(arguments, chemicalHandler);
+        return AEMekanismApi.exportToTank(arguments, computer, this);
     }
 
     @Override