extra fixes

tyap-lyap · Jan 11, 2023 · 3dcaebc · 3dcaebc
1 parent dc5e9fb
commit 3dcaebc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/main/java/winterly/block/FrozenFlowerBlock.java b/src/main/java/winterly/block/FrozenFlowerBlock.java
@@ -1,5 +1,6 @@
 package winterly.block;
 
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -127,11 +128,13 @@ public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random
 				world.setBlockState(pos, Objects.requireNonNullElse(cachedFlower, this).getDefaultState());
 			}
 		}
-		else if(!state.get(PERSISTENT) && world.getLightLevel(LightType.SKY, pos) > 0 && world.getBiome(pos).value().getTemperature(pos) >= 0.15F) {
-			dropStacks(state, world, pos);
-			if(state.get(LAYERS) != 0) {
-				var cachedFlower = CachedFlowers.getFlower(world.getRegistryKey(), pos);
-				world.setBlockState(pos, Objects.requireNonNullElse(cachedFlower, this).getDefaultState());
+		else if(FabricLoader.getInstance().isModLoaded("seasons")) {
+			if(!state.get(PERSISTENT) && world.getLightLevel(LightType.SKY, pos) > 0 && world.getBiome(pos).value().getTemperature(pos) >= 0.15F) {
+				dropStacks(state, world, pos);
+				if(state.get(LAYERS) != 0) {
+					var cachedFlower = CachedFlowers.getFlower(world.getRegistryKey(), pos);
+					world.setBlockState(pos, Objects.requireNonNullElse(cachedFlower, this).getDefaultState());
+				}
 			}
 		}
 	}

diff --git a/src/main/java/winterly/block/FrozenGrassBlock.java b/src/main/java/winterly/block/FrozenGrassBlock.java
@@ -1,5 +1,6 @@
 package winterly.block;
 
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -49,10 +50,11 @@ public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random
 			dropStacks(state, world, pos);
 			world.setBlockState(pos, Blocks.GRASS.getDefaultState());
 		}
-
-		if(!state.get(PERSISTENT) && world.getLightLevel(LightType.SKY, pos) > 0 && world.getBiome(pos).value().getTemperature(pos) >= 0.15F) {
-			dropStacks(state, world, pos);
-			world.setBlockState(pos, Blocks.GRASS.getDefaultState());
+		else if(FabricLoader.getInstance().isModLoaded("seasons")) {
+			if(!state.get(PERSISTENT) && world.getLightLevel(LightType.SKY, pos) > 0 && world.getBiome(pos).value().getTemperature(pos) >= 0.15F) {
+				dropStacks(state, world, pos);
+				world.setBlockState(pos, Blocks.GRASS.getDefaultState());
+			}
 		}
 	}
 

diff --git a/src/main/java/winterly/mixin/common/SnowBlockMixin.java b/src/main/java/winterly/mixin/common/SnowBlockMixin.java
@@ -21,11 +21,11 @@ void getPlacementState(ItemPlacementContext ctx, CallbackInfoReturnable<BlockSta
 		BlockState state = ctx.getWorld().getBlockState(ctx.getBlockPos());
 		if(state.isOf(WinterlyBlocks.FROZEN_GRASS)) {
 			int layers = state.get(SnowBlock.LAYERS);
-			cir.setReturnValue(state.with(SnowBlock.LAYERS, Math.min(8, layers + 1)));
+			cir.setReturnValue(state.with(SnowBlock.LAYERS, Math.min(8, layers + 1)).with(FrozenGrassBlock.PERSISTENT, true));
 		}
 		else if(state.isOf(WinterlyBlocks.FROZEN_FLOWER)) {
 			int layers = state.get(FrozenFlowerBlock.LAYERS);
-			cir.setReturnValue(state.with(FrozenFlowerBlock.LAYERS, Math.min(8, layers + 1)));
+			cir.setReturnValue(state.with(FrozenFlowerBlock.LAYERS, Math.min(8, layers + 1)).with(FrozenGrassBlock.PERSISTENT, true));
 		}
 		else if(state.isOf(Blocks.GRASS)) {
 			cir.setReturnValue(WinterlyBlocks.FROZEN_GRASS.getDefaultState().with(FrozenGrassBlock.PERSISTENT, true));