v2.2.10

.github/workflows/release.yml

@@ -35,9 +35,8 @@ jobs:
         release_name: Release ${{ github.ref }}
         body: |
           Changes in this Release
-          - Fixed importer using FluidHandler instead of tank properties when extracting. This fixes extracting from some GregTech machines
-          - Fixed holding shift in grid sometimes hiding all items
-          - Small performance improvement when importing items while a crafting task is running
+          - Fixed items with different capabilities stacking
+          - Improved the OC integration
         draft: false
         prerelease: false
     - name: Upload jars to release

CHANGELOG.md

@@ -1,5 +1,9 @@
 # More Refined Storage Changelog
 
+# 2.2.10
+- Fixed items with different capabilities stacking
+- Improved the OC integration
+
 # 2.2.9
 - Fixed importer using FluidHandler instead of tank properties when extracting. This fixes extracting from some GregTech machines
 - Fixed holding shift in grid sometimes hiding all items

build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "2.2.9"
+version = "2.2.10"
 
 group = "refinedstorage"
 archivesBaseName = "morerefinedstorage"

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java

@@ -414,6 +414,23 @@ public boolean equals(Object obj) {
         return false;
     }
 
+    @Override
+    public String toString() {
+        return "CraftingPattern{" +
+               "processing=" + processing +
+               ", oredict=" + oredict +
+               ", valid=" + valid +
+               ", recipe=" + recipe +
+               ", inputs=" + inputs +
+               ", outputs=" + outputs +
+               ", byproducts=" + byproducts +
+               ", fluidInputs=" + fluidInputs +
+               ", fluidOutputs=" + fluidOutputs +
+               ", blacklistedItems=" + blacklistedItems +
+               ", blacklistedFluids=" + blacklistedFluids +
+               '}';
+    }
+
     private static class InventoryCraftingDummy extends InventoryCrafting {
         public InventoryCraftingDummy() {
             super(new Container() {

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/engine/task/Task.java

@@ -235,7 +235,14 @@ public Task(@Nonnull ICraftingPattern pattern, ICraftingRequestInfo requestInfo)
         }
 
         if (outputStackSize < 1)
-            throw new IllegalStateException("This pattern does not seem to create the requested item!?");
+            throw new IllegalStateException(
+                    String.format(
+                            "This pattern does not seem to create the requested item!? outputStackSize: %d, requested: %s, my pattern: %s",
+                            outputStackSize,
+                            requestInfo.getFluid() != null ? requestInfo.getFluid().toString() : requestInfo.getItem().toString(),
+                            this.pattern
+                    )
+            );
 
         //calculate actual needed amount, basically the amount of iterations that have to be run
         this.amountNeeded = (long) Math.ceil((double) amountNeeded / (double) outputStackSize);

src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java

@@ -408,11 +408,11 @@ public Object[] getItems(final Context context, final Arguments args) {
 
     @Callback(doc = "function():table -- Gets a list of all connected storage disks and blocks in this network.")
     public Object[] getStorages(final Context context, final Arguments args) {
-        int totalItemStored = 0;
-        int totalItemCapacity = 0;
+        long totalItemStored = 0;
+        long totalItemCapacity = 0;
 
-        int totalFluidStored = 0;
-        int totalFluidCapacity = 0;
+        long totalFluidStored = 0;
+        long totalFluidCapacity = 0;
 
         List<Map<String, Object>> devices = new ArrayList<>();
 
@@ -452,11 +452,11 @@ public Object[] getStorages(final Context context, final Arguments args) {
             }
         }
 
-        Map<String, Integer> itemTotals = new HashMap<>();
+        Map<String, Long> itemTotals = new HashMap<>();
         itemTotals.put("usage", totalItemStored);
         itemTotals.put("capacity", totalItemCapacity);
 
-        Map<String, Integer> fluidTotals = new HashMap<>();
+        Map<String, Long> fluidTotals = new HashMap<>();
         fluidTotals.put("usage", totalFluidStored);
         fluidTotals.put("capacity", totalFluidCapacity);