Make snow no longer place on waterwheels correctly

voidsong-dragonfly · Jun 16, 2024 · e9198a2 · e9198a2
1 parent 5fa9e57
commit e9198a2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java b/src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java
@@ -169,6 +169,9 @@ protected void addTags(Provider p_256380_)
 				.add(StoneDecoration.CONCRETE_REINFORCED_TILE.get())
 				.add(IEBlocks.TO_SLAB.get(StoneDecoration.CONCRETE_REINFORCED_TILE.getId()).get())
 				.add(MetalDecoration.REINFORCED_WINDOW.get());
+		tag(BlockTags.SNOW_LAYER_CANNOT_SURVIVE_ON)
+				.add(WoodenDevices.WATERMILL.get())
+				.add(WoodenDevices.WINDMILL.get());
 		//Add parity tags to gravel & sand for IE similar blocks
 		tag(BlockTags.BAMBOO_PLANTABLE_ON)
 				.add(StoneDecoration.SLAG_GRAVEL.get())

diff --git a/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173 b/src/generated/resources/.cache/8861e8b56b8339d4437e7f8f8306e4a1ccd9b173
diff --git a/src/generated/resources/data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json b/src/generated/resources/data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json
diff --git a/src/main/java/blusunrize/immersiveengineering/common/blocks/wooden/WatermillBlockEntity.java b/src/main/java/blusunrize/immersiveengineering/common/blocks/wooden/WatermillBlockEntity.java
@@ -191,9 +191,9 @@ public boolean isBlocked()
 			{
 				BlockPos pos = getBlockPos().relative(fdW, 2).relative(fdY, 2);
 				BlockState state = level.getBlockState(pos);
-				if(Block.isFaceFull(state.getShape(level, pos), fdW.getOpposite())&&!state.canBeReplaced())
+				if(Block.isFaceFull(state.getShape(level, pos), fdW.getOpposite()))
 					return true;
-				if(Block.isFaceFull(state.getShape(level, pos), fdY.getOpposite())&&!state.canBeReplaced())
+				if(Block.isFaceFull(state.getShape(level, pos), fdY.getOpposite()))
 					return true;
 			}
 		//Check side blocks for solid blocks
@@ -202,15 +202,15 @@ public boolean isBlocked()
 		{
 			BlockPos pos = getBlockPos().relative(side, 3).relative(side.getClockWise(getFacing().getAxis()));
 			BlockState state = level.getBlockState(pos);
-			if(Block.isFaceFull(state.getShape(level, pos), side.getOpposite())&&!state.canBeReplaced())
+			if(Block.isFaceFull(state.getShape(level, pos), side.getOpposite()))
 				return true;
 			pos = getBlockPos().relative(side, 3);
 			state = level.getBlockState(pos);
-			if(Block.isFaceFull(state.getShape(level, pos), side.getOpposite())&&!state.canBeReplaced())
+			if(Block.isFaceFull(state.getShape(level, pos), side.getOpposite()))
 				return true;
 			pos = getBlockPos().relative(side, 3).relative(side.getCounterClockWise(getFacing().getAxis()));
 			state = level.getBlockState(pos);
-			if(Block.isFaceFull(state.getShape(level, pos), side.getOpposite())&&!state.canBeReplaced())
+			if(Block.isFaceFull(state.getShape(level, pos), side.getOpposite()))
 				return true;
 		}
 		return false;