Fix compression handling in edge cases

MattiDragon · Jul 13, 2023 · cd9034f · cd9034f
1 parent f91b264
commit cd9034f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/changelog/2.0.3+1.20.1.md b/changelog/2.0.3+1.20.1.md
@@ -0,0 +1 @@
+* Fix compression handling in edge cases
diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionRecipeManager.java b/src/main/java/io/github/mattidragon/extendeddrawers/compacting/CompressionRecipeManager.java
@@ -92,6 +92,7 @@ private ItemVariant findBottom(ItemVariant item, World world) {
         return candidate;
     }
 
+    @Nullable
     private RecipePair findCompressionRecipe(ItemVariant decompressed, World world) {
         return IntStream.of(3, 2, 1)
                 .mapToObj(size -> findCompressionRecipeForSize(decompressed, world, size))
@@ -101,17 +102,19 @@ private RecipePair findCompressionRecipe(ItemVariant decompressed, World world)
     }
 
     private Stream<RecipePair> findCompressionRecipeForSize(ItemVariant decompressed, World world, int size) {
+        var decompressedStack = decompressed.toStack(size * size);
         return findRecipes(decompressed.toStack(), size, world) // Find compression recipes
-                .filter(compressed -> findRecipes(compressed, 1, world).anyMatch(decompressed::matches))// Find matching decompression recipe
+                .filter(compressed -> findRecipes(compressed, 1, world).anyMatch(decompressed2 -> ItemStack.areEqual(decompressed2, decompressedStack))) // Find matching decompression recipe
                 .map(compressed -> new RecipePair(ItemVariant.of(compressed), decompressed, size * size));
     }
 
     @Nullable
     private RecipePair findDecompressionRecipe(ItemVariant compressed, World world) {
-        return findRecipes(compressed.toStack(), 1, world) // Find decompression recipe
-                .flatMap(result -> IntStream.of(3, 2, 1) // Check each size from largest to smallest for matching compression recipes
-                        .filter(size -> findRecipes(result, size, world).anyMatch(compressed::matches))
-                        .mapToObj(size -> new RecipePair(compressed, ItemVariant.of(result), size * size)))
+        var compressedStack = compressed.toStack();
+        return findRecipes(compressedStack, 1, world) // Find decompression recipe
+                .flatMap(decompressed -> IntStream.of(3, 2, 1) // Check each size from largest to smallest for matching compression recipes
+                        .filter(size -> findRecipes(decompressed, size, world).anyMatch(compressed2 -> ItemStack.areEqual(compressedStack, compressed2)))
+                        .mapToObj(size -> new RecipePair(compressed, ItemVariant.of(decompressed), size * size)))
                 .findFirst()
                 .orElse(null);
     }