fix: 🐛 Fixed barrel material recipe deadlock with refined storage 2

P3pp3rF1y · Jan 3, 2025 · 7f369ca · 7f369ca
1 parent 496d8a8
commit 7f369ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedstorage
 mod_name=Sophisticated Storage
 mod_license=GNU General Public License v3.0
-mod_version=1.0.10
+mod_version=1.0.11
 mod_group_id=sophisticatedstorage
 mod_authors=P3pp3rF1y, Ridanisaurus
 mod_description=Fancy and functional storage containers.

diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/crafting/BarrelMaterialRecipe.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/crafting/BarrelMaterialRecipe.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.item.crafting.CraftingInput;
 import net.minecraft.world.item.crafting.CustomRecipe;
 import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.level.EmptyBlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.p3pp3rf1y.sophisticatedstorage.block.BarrelBlock;
@@ -52,7 +53,7 @@ public boolean matches(CraftingInput input, Level level) {
 					} else {
 						return false;
 					}
-				} else if (item.getItem() instanceof BlockItem blockItem && Block.isShapeFullBlock(blockItem.getBlock().defaultBlockState().getShape(level, BlockPos.ZERO))) {
+				} else if (item.getItem() instanceof BlockItem blockItem && Block.isShapeFullBlock(blockItem.getBlock().defaultBlockState().getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO))) {
 					boolean isBottomMiddleAndBottomLeftHasBlock = barrelCol == col && barrelRow < row && rowCounts.getOrDefault(row, 0) > 0;
 					if (isBottomMiddleAndBottomLeftHasBlock) {
 						return false;