Fix case when external storage is not slotted

nk2IsHere · Jan 14, 2025 · 76f5628 · 76f5628
1 parent 0a307c2
commit 76f5628
Show file tree

Hide file tree

Showing 17 changed files with 87 additions and 17 deletions.
diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
@@ -39,7 +39,7 @@
 import appeng.client.render.cablebus.CubeBuilder;
 import appeng.core.AppEng;
 import appeng.helpers.Splotch;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 /**
  * Renders paint blocks, which render multiple "splotches" that have been applied to the sides of adjacent blocks using

diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
@@ -44,7 +44,7 @@
 import appeng.client.render.cablebus.CubeBuilder;
 import appeng.core.AppEng;
 import appeng.core.definitions.AEBlocks;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 class QnbFormedBakedModel implements IFabricBakedModel {
     private static final Material TEXTURE_LINK = new Material(TextureAtlas.LOCATION_BLOCKS,

diff --git a/src/main/java/appeng/client/render/DelegateBakedModel.java b/src/main/java/appeng/client/render/DelegateBakedModel.java
@@ -35,7 +35,7 @@
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
 
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class DelegateBakedModel implements IFabricBakedModel {

diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
@@ -45,7 +45,7 @@
 import appeng.api.parts.IPartModel;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEColor;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 import appeng.parts.reporting.ReportingModelData;
 
 @Environment(EnvType.CLIENT)

diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
@@ -18,7 +18,7 @@
 
 package appeng.client.render.cablebus;
 
-import static appeng.integration.abstraction.IFabricBakedModel.renderer;
+import static appeng.integration.fabric.IFabricBakedModel.renderer;
 
 import java.util.*;
 import java.util.Map.Entry;

diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
@@ -36,7 +36,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 
 import appeng.api.util.AEColor;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 import appeng.util.Platform;
 
 public class P2PTunnelFrequencyBakedModel implements IFabricBakedModel {

diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java
@@ -34,7 +34,7 @@
 
 import appeng.blockentity.crafting.CraftingCubeModelData;
 import appeng.client.render.cablebus.CubeBuilder;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 import appeng.util.Platform;
 
 /**

diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java
@@ -48,7 +48,7 @@
 
 import appeng.decorative.solid.GlassState;
 import appeng.decorative.solid.QuartzGlassBlock;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 class GlassBakedModel implements IFabricBakedModel {
 

diff --git a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java
@@ -41,7 +41,7 @@
 import appeng.api.util.AEColor;
 import appeng.client.render.cablebus.CubeBuilder;
 import appeng.core.AELog;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 class MemoryCardBakedModel implements IFabricBakedModel {
     private final BakedModel baseModel;

diff --git a/src/main/java/appeng/client/render/model/MeteoriteCompassBakedModel.java b/src/main/java/appeng/client/render/model/MeteoriteCompassBakedModel.java
@@ -43,7 +43,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 
 import appeng.hooks.CompassManager;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 /**
  * This baked model combines the quads of a compass base and the quads of a compass pointer, which will be rotated

diff --git a/src/main/java/appeng/client/render/tesr/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/tesr/spatial/SpatialPylonBakedModel.java
@@ -41,7 +41,7 @@
 
 import appeng.blockentity.spatial.SpatialPylonBlockEntity;
 import appeng.client.render.cablebus.CubeBuilder;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 /**
  * The baked model that will be used for rendering the spatial pylon.

diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java
@@ -47,7 +47,7 @@
 import appeng.core.definitions.AEBlocks;
 import appeng.core.definitions.AEEntities;
 import appeng.core.network.clientbound.MockExplosionPacket;
-import appeng.integration.abstraction.IFabricCustomEntity;
+import appeng.integration.fabric.IFabricCustomEntity;
 
 public final class TinyTNTPrimedEntity extends PrimedTnt implements IFabricCustomEntity {
 

diff --git a/...ration/abstraction/IFabricBakedModel.java → ...integration/fabric/IFabricBakedModel.java b/...ration/abstraction/IFabricBakedModel.java → ...integration/fabric/IFabricBakedModel.java
@@ -1,4 +1,4 @@
-package appeng.integration.abstraction;
+package appeng.integration.fabric;
 
 import java.util.List;
 

diff --git a/...tion/abstraction/IFabricCustomEntity.java → ...tegration/fabric/IFabricCustomEntity.java b/...tion/abstraction/IFabricCustomEntity.java → ...tegration/fabric/IFabricCustomEntity.java
@@ -1,4 +1,4 @@
-package appeng.integration.abstraction;
+package appeng.integration.fabric;
 
 import net.minecraft.network.FriendlyByteBuf;
 

diff --git a/src/main/java/appeng/integration/fabric/NonSlotStorageAdapter.java b/src/main/java/appeng/integration/fabric/NonSlotStorageAdapter.java
@@ -0,0 +1,67 @@
+package appeng.integration.fabric;
+
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+
+public class NonSlotStorageAdapter<T> implements SingleSlotStorage<T> {
+
+    private final Storage<T> storage;
+
+    public NonSlotStorageAdapter(Storage<T> storage) {
+        this.storage = storage;
+    }
+
+    @Override
+    public long insert(
+        T resource,
+        long maxAmount,
+        TransactionContext transaction
+    ) {
+        return storage.insert(resource, maxAmount, transaction);
+    }
+
+    @Override
+    public long extract(
+        T resource,
+        long maxAmount,
+        TransactionContext transaction
+    ) {
+        return storage.extract(resource, maxAmount, transaction);
+    }
+
+    @Override
+    public boolean isResourceBlank() {
+        return !storage.nonEmptyIterator().hasNext();
+    }
+
+    @Override
+    public T getResource() {
+        for (var storageView : storage) {
+            return storageView.getResource();
+        }
+
+        return null;
+    }
+
+    @Override
+    public long getAmount() {
+        var iterator = storage.nonEmptyIterator();
+
+        var count = 0L;
+        while(iterator.hasNext()) {
+            count += iterator.next().getAmount();
+        }
+
+        return count;
+    }
+
+    @Override
+    public long getCapacity() {
+        for (var storageView : storage) {
+            return storageView.getCapacity();
+        }
+
+        return 0;
+    }
+}
diff --git a/src/main/java/appeng/me/storage/ExternalStorageFacade.java b/src/main/java/appeng/me/storage/ExternalStorageFacade.java
@@ -2,6 +2,7 @@
 
 import java.util.Set;
 
+import appeng.integration.fabric.NonSlotStorageAdapter;
 import com.google.common.primitives.Ints;
 
 import org.jetbrains.annotations.Nullable;
@@ -98,7 +99,8 @@ private static class ItemHandlerFacade extends ExternalStorageFacade {
 
         public ItemHandlerFacade(Storage<ItemVariant> handler) {
             if(!(handler instanceof SlottedStorage<ItemVariant> slottedStorage)) {
-                throw new IllegalArgumentException("Item handler must be slotted");
+                this.handler = new NonSlotStorageAdapter<>(handler);
+                return;
             }
 
             this.handler = slottedStorage;
@@ -300,7 +302,8 @@ private static class FluidHandlerFacade extends ExternalStorageFacade {
 
         public FluidHandlerFacade(Storage<FluidVariant> handler) {
             if(!(handler instanceof SlottedStorage<FluidVariant> slottedStorage)) {
-                throw new IllegalArgumentException("Fluid handler must be slotted");
+                this.handler = new NonSlotStorageAdapter<>(handler);
+                return;
             }
 
             this.handler = slottedStorage;

diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java
@@ -32,7 +32,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 
 import appeng.client.render.cablebus.CubeBuilder;
-import appeng.integration.abstraction.IFabricBakedModel;
+import appeng.integration.fabric.IFabricBakedModel;
 
 /**
  * Built-in model for annihilation planes that supports connected textures.