update

reobf · Feb 17, 2025 · 4340247 · 4340247
1 parent 4ad703e
commit 4340247
Show file tree

Hide file tree

Showing 12 changed files with 1,714 additions and 633 deletions.
diff --git a/src/main/java/reobf/proghatches/ae/PartAmountMaintainer.java b/src/main/java/reobf/proghatches/ae/PartAmountMaintainer.java
@@ -102,6 +102,7 @@ public void writeToNBT(NBTTagCompound data) {
                 data.setInteger("rsmode", rsmode);
                 data.setInteger("redstone", redstone);
                 data.setLong("amount", amount);
+                data.setInteger("interval", interval);
                 // data.setBoolean("lastredstone", lastredstone);
                 if (mark[0] != null) data.setTag("mark", mark[0].writeToNBT(new NBTTagCompound()));
                 // if(upgrade[0]!=null)data.setTag("upgrade", upgrade[0].writeToNBT(new NBTTagCompound()));
@@ -121,6 +122,7 @@ public void readFromNBT(NBTTagCompound data) {
                 rsmode = data.getInteger("rsmode");
                 redstone = data.getInteger("redstone");
                 amount = data.getLong("amount");
+               interval= data.getInteger("interval");
                 // lastredstone=data.getBoolean("lastredstone" );
                 if (data.getCompoundTag("mark")
                     .hasNoTags() == false) mark[0] = ItemStack.loadItemStackFromNBT(data.getCompoundTag("mark"));

diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java
@@ -1181,7 +1181,7 @@ public interface VargsFunction<T, R> {
         })
         .filter(a -> a != null && a.amount > 0)
         .toArray(FluidStack[]::new);
-    static VargsFunction<ItemStack[], ItemStack[]> filterStack = (s) -> Arrays.stream(s)
+    public static VargsFunction<ItemStack[], ItemStack[]> filterStack = (s) -> Arrays.stream(s)
         .flatMap(Arrays::stream)
         .filter(a -> a != null)
         .toArray(ItemStack[]::new);