Merge pull request #497 from P3pp3rF1y/1.21.x-dev

Release merge
P3pp3rF1y · Oct 1, 2024 · 63d4443 · 63d4443
2 parents 236a67c + 1a379f2
commit 63d4443
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 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=0.10.42
+mod_version=0.10.44
 mod_group_id=sophisticatedstorage
 mod_authors=P3pp3rF1y, Ridanisaurus
 mod_description=Fancy and functional storage containers.

diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/block/ChestBlock.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/block/ChestBlock.java
@@ -192,11 +192,12 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {
 		}
 
 		Direction direction = context.getHorizontalDirection().getOpposite();
+		StackStorageWrapper wrapper = StackStorageWrapper.fromStack(context.getLevel().registryAccess(), chestBeingPlaced);
 		return getStateForPlacement(context, direction, fluidstate,
 				StorageBlockItem.getMainColorFromStack(chestBeingPlaced).orElse(-1),
 				StorageBlockItem.getAccentColorFromStack(chestBeingPlaced).orElse(-1),
 				WoodStorageBlockItem.getWoodType(chestBeingPlaced).orElse(WoodType.ACACIA),
-				InventoryHelper.isEmpty(StackStorageWrapper.fromStack(context.getLevel().registryAccess(), chestBeingPlaced).getUpgradeHandler()));
+				wrapper.getContentsUuid().isPresent() && InventoryHelper.isEmpty(wrapper.getUpgradeHandler()));
 	}
 
 	private BlockState getStateForPlacement(BlockPlaceContext context, Direction direction, FluidState fluidstate, int mainColor, int accentColor, WoodType woodType, boolean itemHasNoUpgrades) {

diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/client/gui/StorageButtonDefinitions.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/client/gui/StorageButtonDefinitions.java
@@ -17,7 +17,7 @@ public class StorageButtonDefinitions {
 			Map.of(
 					ContentsFilterType.ALLOW, getButtonStateData(new UV(0, 0), StorageTranslationHelper.INSTANCE.translUpgradeButton("allow"), Dimension.SQUARE_16, new Position(1, 1)),
 					ContentsFilterType.BLOCK, getButtonStateData(new UV(16, 0), StorageTranslationHelper.INSTANCE.translUpgradeButton("block"), Dimension.SQUARE_16, new Position(1, 1)),
-					ContentsFilterType.STORAGE, getButtonStateData(new UV(80, 16), StorageTranslationHelper.INSTANCE.translUpgradeButton("match_storage_contents"), Dimension.SQUARE_16, new Position(1, 1))
+					ContentsFilterType.STORAGE, getButtonStateData(new UV(64, 16), StorageTranslationHelper.INSTANCE.translUpgradeButton("match_storage_contents"), Dimension.SQUARE_16, new Position(1, 1))
 			));
 
 	private StorageButtonDefinitions() {}