Test AE and fix bug

Author: passplease

.github/workflows/publish.yml

@@ -2,6 +2,7 @@ name: Build
 
 on:
   workflow_dispatch:
+  pull_request:
   push:
     branches:
       - 1.20.1-6.0.0-forge
@@ -33,28 +34,62 @@ jobs:
         with:
           gradle-version: '8.11.1'
 
-      - name: Test Server
-        run: gradle runGameTestServer
-        continue-on-error: true
-
       - name: Build with Gradle
         run: gradle build
 
       - name: Create timestamp
         id: create_timestamp
-        run: echo "timestamp=$(date '+%Y-%m-%d-%H')" >> $GITHUB_OUTPUT
+        run: echo "timestamp=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT
         shell: bash
 
       - uses: Kir-Antipov/mc-publish@v3.3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           github-tag: 1.20.1-6.0.0-Forge_NeoForge-${{ steps.create_timestamp.outputs.timestamp }}
           github-draft: false
-          github-prerelease: false
+          github-prerelease: true
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Build Artifact
+          include-hidden-files: true
+          path: |
+            **/logs/
+            **/crash-reports/
+            build/libs
+          retention-days: 1
+        if: always()
+  GameTest:
+    strategy:
+      max-parallel: 2
+      fail-fast: false
+      matrix:
+        GameTestConfig: [ default, testAE ]
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: '8.11.1'
+
+      - name: Test Server with ${{ matrix.GameTestConfig }}
+        run: gradle runGameTestServer -PGameTestConfig=${{ matrix.GameTestConfig }}
+        continue-on-error: true
 
       - uses: actions/upload-artifact@v4
         with:
-          overwrite: true
+          name: Test Artifact of ${{ matrix.GameTestConfig }}
           include-hidden-files: true
           path: |
             **/logs/

README.md

@@ -14,7 +14,7 @@ If you want to download code on your computer, please change gradle version in `
 * For Chinese, you can also find more links in [MCMODS](https://www.mcmod.cn/class/15306.html)
 ## About Plans
 - [x] Support 1.21.1
-- [ ] Transplant all stuff to 1.20.1 and 1.21.1
+- [x] Transplant all stuff to 1.20.1 and 1.21.1
 ## License
 [MIT_License](https://mit-license.org/)
 ## Thanks

build.gradle

@@ -28,6 +28,7 @@ java {
 }
 
 boolean ponderInWorkspace = rootProject.hasProperty('multiModWorkspace.ponder')
+def GameTestConfig = project.properties.get('GameTestConfig','default')
 
 legacyForge {
     version = "$minecraft_version-$forge_version"
@@ -75,7 +76,9 @@ legacyForge {
         gameTestServer {
             type = "gameTestServer"
 
-            gameDirectory = project.file('run/gametest')
+            if(GameTestConfig != 'default')
+                gameDirectory = project.file("run/gametest/${GameTestConfig}")
+            else gameDirectory = project.file('run/gametest')
         }
 
         data {
@@ -178,6 +181,23 @@ tasks.named('jar', Jar).configure {
     finalizedBy 'reobfJar'
 }
 
+tasks.register("prepareGameTestConfigs", Copy) {
+    group = 'mod development'
+    description = "Copy config files for GameTestServer"
+    if(GameTestConfig != 'default') {
+        def configFiles = project.file(GameTestConfigDir)
+        if (!configFiles.exists() || !configFiles.isDirectory()) {
+            throw new GradleException("config set directory '${configFiles}' does not exist for GameTestServer. ")
+        }
+        from fileTree("${configFiles}/${GameTestConfig}")
+        into runGameTestServer.gameDirectory.file('config')
+    }
+}
+
+tasks.named('runGameTestServer', JavaExec){
+    dependsOn prepareGameTestConfigs
+}
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }

gradle.properties

@@ -43,7 +43,7 @@ mod_name=SmarterContraptionStorage
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT_License
 # The mod version. See https://semver.org/
-mod_version=1.20.1-6.0.0-beta-1.4.3
+mod_version=1.20.1-6.0.0-1.4.3
 # The group ID for the mod. It is only important when publishing as an artifact to Excludes.BuildNBTFile Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -55,4 +55,5 @@ mod_description=A mod to make Contraption's storage smarter
 registrate_version=MC1.20-1.3.3
 flywheel_version=0.6.10-7
 ponder_version=1.0.52
-ATFile=src/main/resources/META-INF/accesstransformer.cfg
+ATFile=src/main/resources/META-INF/accesstransformer.cfg
+GameTestConfigDir=src/test/resources/GameTest/Config

src/main/java/net/smartercontraptionstorage/AddStorage/ItemHandler/AE2BusBlockHelper.java

@@ -14,6 +14,7 @@
 import appeng.blockentity.misc.InterfaceBlockEntity;
 import appeng.blockentity.networking.*;
 import appeng.blockentity.spatial.SpatialIOPortBlockEntity;
+import appeng.core.definitions.AEBlocks;
 import appeng.core.definitions.AEItems;
 import appeng.items.tools.powered.WirelessCraftingTerminalItem;
 import appeng.me.GridNode;
@@ -35,6 +36,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.function.Consumer;
 
 public class AE2BusBlockHelper extends StorageHandlerHelper{
     @Override
@@ -50,7 +52,7 @@ public void addStorageToWorld(BlockEntity entity, ItemStackHandler handler) {}
         assert this.canCreateHandler(entity);
 
         CableBusBlockEntity bus = (CableBusBlockEntity)entity;
-        ICablePart center = (ICablePart)bus.getPart((Direction)null);
+        ICablePart center = (ICablePart)bus.getPart(null);
         if (center != null && center.getCableConnectionType() == AECableType.COVERED) {
             IGridNode exportHost = null;
             IGridNode importHost = null;
@@ -66,7 +68,7 @@ public void addStorageToWorld(BlockEntity entity, ItemStackHandler handler) {}
                     if (key != null) {
                         ItemStack item = key.wrapForDisplayOrFilter();
                         if (item.getItem() instanceof WirelessCraftingTerminalItem terminal) {
-                            if (!checkUpgrade(terminal.getUpgrades(item), AEItems.ENERGY_CARD.asItem(),3)) {
+                            if (!checkUpgrade(terminal.getUpgrades(item), AEItems.ENERGY_CARD.asItem())) {
                                 continue;
                             }
 
@@ -134,6 +136,11 @@ public boolean allowControl(Block block) {
         return false;
     }
 
+    @Override
+    public void registerBlock(Consumer<Block> register) {
+        register.accept(AEBlocks.CABLE_BUS.block());
+    }
+
     @Override
     public String getName() {
         return "AE2BusBlockHelper";
@@ -238,7 +245,7 @@ public boolean useEnergy(boolean extractOrImport,boolean simulate){
 
         @Override
         public @NotNull ItemStack extractItem(int slot, int amount, boolean simulate) {
-            if(canWork(true,simulate)) {
+            if(canWork(true,simulate) && slot < extractKeys.size()) {
                 MEStorage extractStorage = getStorage(true);
                 if (extractStorage == null)
                     return ItemStack.EMPTY;
@@ -276,7 +283,7 @@ public void refreshStack(@Nullable MEStorage extractStorage){// synchronize stor
         @Override
         public int getSlots() {
             refreshStack(getStorage(true));
-            return extractKeys.size();
+            return Math.max(extractKeys.size(),1);
         }
 
         @Override
@@ -289,11 +296,7 @@ public void finallyDo() {
             boolean controller = false,energy = false;
             for(BlockEntity entity : StorageHandlerHelper.BlockEntityList) {
                 if (entity instanceof InterfaceBlockEntity MEInterface) {
-                    IGridNode node = MEInterface.getInterfaceLogic().getActionableNode();
-                    if (node == null)
-                        continue;
-                    MEStorage storage = node.getGrid().getStorageService().getInventory();
-                    extractKeys.addAll(storage.getAvailableStacks().keySet());
+                    extractKeys.addAll(MEInterface.getInterfaceLogic().getConfig().getAvailableStacks().keySet());
                 } else if (controller || entity instanceof ControllerBlockEntity)
                     controller = true;
                 else if(energy || entity instanceof EnergyCellBlockEntity || entity instanceof CreativeEnergyCellBlockEntity)

src/main/java/net/smartercontraptionstorage/AddStorage/ItemHandler/CobblestoneGenerator.java

@@ -11,6 +11,8 @@
 import net.minecraftforge.lex.cfd.CobbleGenTile;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Consumer;
+
 public class CobblestoneGenerator extends StorageHandlerHelper{
     public static final ItemStackHandler cobblestoneGenerator = new ItemStackHandler(){
         @Override
@@ -50,6 +52,11 @@ public boolean allowControl(Block block) {
         return block == CobbleForDays.TIER5_BLOCK.get();
     }
 
+    @Override
+    public void registerBlock(Consumer<Block> register) {
+        register.accept(CobbleForDays.TIER5_BLOCK.get());
+    }
+
     @Override
     public String getName() {
         return "CobblestoneGenerator";

src/main/java/net/smartercontraptionstorage/AddStorage/ItemHandler/CompactingHandlerHelper.java

@@ -25,6 +25,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
+import java.util.function.Consumer;
 
 public class CompactingHandlerHelper extends DrawersHandlerHelper{
     @Override
@@ -51,6 +52,8 @@ public boolean allowControl(Block block) {
         return block instanceof BlockCompDrawers;
     }
     @Override
+    public void registerBlock(Consumer<Block> register) {}
+    @Override
     public String getName() {
         return "CompactingHandlerHelper";
     }

src/main/java/net/smartercontraptionstorage/AddStorage/ItemHandler/DrawersHandlerHelper.java

@@ -6,6 +6,7 @@
 import com.jaquadro.minecraft.storagedrawers.block.tile.BlockEntityDrawers;
 import com.jaquadro.minecraft.storagedrawers.block.tile.BlockEntityDrawersStandard;
 import com.jaquadro.minecraft.storagedrawers.block.tile.tiledata.UpgradeData;
+import com.jaquadro.minecraft.storagedrawers.core.ModBlocks;
 import net.createmod.catnip.nbt.NBTHelper;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.IntTag;
@@ -30,6 +31,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 public class DrawersHandlerHelper extends StorageHandlerHelper {
     public static final String NAME = "DrawersHandlerHelper";
@@ -71,6 +73,10 @@ public boolean allowControl(Block block){
         return block instanceof BlockDrawers && !(block instanceof BlockCompDrawers);
     }
     @Override
+    public void registerBlock(Consumer<Block> register) {
+        ModBlocks.getDrawers().forEach(register);
+    }
+    @Override
     public String getName() {
         return NAME;
     }

src/main/java/net/smartercontraptionstorage/AddStorage/ItemHandler/FunctionalCompactingHandlerHelper.java

@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 import static com.buuz135.functionalstorage.inventory.CompactingInventoryHandler.*;
 
@@ -85,6 +86,9 @@ public boolean allowControl(Block block) {
         return block instanceof CompactingDrawerBlock || block instanceof SimpleCompactingDrawerBlock;
     }
 
+    @Override
+    public void registerBlock(Consumer<Block> register) {}
+
     @Override
     public String getName() {
         return NAME;

src/main/java/net/smartercontraptionstorage/AddStorage/ItemHandler/FunctionalDrawersHandlerHelper.java

@@ -1,5 +1,6 @@
 package net.smartercontraptionstorage.AddStorage.ItemHandler;
 
+import com.buuz135.functionalstorage.FunctionalStorage;
 import com.buuz135.functionalstorage.block.DrawerBlock;
 import com.buuz135.functionalstorage.block.tile.DrawerTile;
 import com.buuz135.functionalstorage.inventory.BigInventoryHandler;
@@ -30,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 import static com.buuz135.functionalstorage.inventory.BigInventoryHandler.*;
 
@@ -78,6 +80,15 @@ public boolean allowControl(Block block) {
         return block instanceof DrawerBlock;
     }
 
+    @Override
+    public void registerBlock(Consumer<Block> register) {
+        FunctionalStorage.DRAWER_TYPES.forEach((type,list) -> {
+            list.forEach(drawer -> {
+                register.accept(drawer.getLeft().get());
+            });
+        });
+    }
+
     @Override
     public String getName() {
         return NAME;