Merge pull request #496 from P3pp3rF1y/1.20.x-dev

Release merge
P3pp3rF1y · Oct 1, 2024 · 99817b8 · 99817b8
2 parents 4451e73 + 3114b28
commit 99817b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedstorage
 mod_group_id=sophisticatedstorage
-mod_version=0.10.42
+mod_version=0.10.44
 sonar_project_key=sophisticatedstorage:SophisticatedStorage
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedStorage
 

diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/block/ChestBlock.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/block/ChestBlock.java
@@ -196,6 +196,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {
 
 		Direction direction = context.getHorizontalDirection().getOpposite();
 		return chestBeingPlaced.getCapability(CapabilityStorageWrapper.getCapabilityInstance())
+				.filter(wrapper -> wrapper.getContentsUuid().isPresent())
 				.map(wrapper ->
 						getStateForPlacement(context, direction, fluidstate,
 								StorageBlockItem.getMainColorFromStack(chestBeingPlaced).orElse(-1),

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() {}