fix exporter/importer

Pitan76 · Sep 18, 2024 · 242d8a9 · 242d8a9
1 parent fe95b7a
commit 242d8a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/main/java/net/pitan76/itemalchemy/block/EMCExporter.java b/src/main/java/net/pitan76/itemalchemy/block/EMCExporter.java
@@ -44,17 +44,6 @@ public EMCExporter() {
 
     @Override
     public void onStateReplaced(StateReplacedEvent e) {
-        World world = e.world;
-        BlockPos pos = e.pos;
-        if (e.isSameState()) return;
-
-        BlockEntity blockEntity = WorldUtil.getBlockEntity(world, pos);
-        if (blockEntity instanceof Inventory) {
-            Inventory inventory = (Inventory) blockEntity;
-            inventory.setStack(1, ItemStackUtil.empty());
-            ItemScattererUtil.spawn(world, pos, inventory);
-            e.updateComparators();
-        }
         super.onStateReplaced(e);
     }
 

diff --git a/src/main/java/net/pitan76/itemalchemy/tile/EMCExporterTile.java b/src/main/java/net/pitan76/itemalchemy/tile/EMCExporterTile.java
@@ -38,6 +38,8 @@ public EMCExporterTile(TileCreateEvent e) {
         this(Tiles.EMC_EXPORTER.getOrNull(), e);
     }
 
+    public static int maxStackCount = 4096;
+
     @Override
     public void writeNbt(WriteNbtArgs args) {
         NbtCompound filterNbt = NbtUtil.create();
@@ -70,14 +72,25 @@ public void tick(TileTickEvent<EMCExporterTile> e) {
 
     }
 
+    @Override
+    public void setStack(int slot, ItemStack stack) {
+        System.out.println("setStack: " + slot + ", " + stack);
+        IInventory.super.setStack(slot, stack);
+    }
+
+    @Override
+    public ItemStack getStack(int slot) {
+        System.out.println("getStack: " + slot);
+        return IInventory.super.getStack(slot);
+    }
+
     @Override
     public DefaultedList<ItemStack> getItems() {
         DefaultedList<ItemStack> result = DefaultedList.ofSize(filter.size(), ItemStackUtil.empty());
 
         if (!hasTeam()) return result;
         if (filter.get(0).isEmpty()) return result;
 
-
         @SuppressWarnings("OptionalGetWithoutIsPresent")
         TeamState teamState = getTeamState().get();
 
@@ -99,7 +112,8 @@ public DefaultedList<ItemStack> getItems() {
             if (!teamState.registeredItems.contains(ItemUtil.toCompatID(filterStack.getItem()).toString())) continue;
 
             ItemStack stack = filterStack.copy();
-            stack.setCount((int) Math.floorDiv(aveEMC, neededEMC));
+            stack.setCount(Math.min((int) Math.floorDiv(aveEMC, neededEMC), maxStackCount));
+
             result.set(i, stack);
         }