Making deepslate generate below y=0, not y=16 (#1433)

* Fixes #1431 * Updating carpet rule description * Making it work for cobbled deepslate
gnembon · May 11, 2022 · 648ea01 · 648ea01
1 parent e5a3cdf
commit 648ea01
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java
@@ -877,8 +877,7 @@ public enum RenewableCoralMode {
     public static boolean renewableBlackstone = false;
 
     @Rule(
-            desc = "Lava and water generate deepslate and cobbled deepslate instead below Y16",
-            extra = "This rule may change Y value to 0 with 1.18",
+            desc = "Lava and water generate deepslate and cobbled deepslate instead below Y0",
             category = FEATURE
     )
     public static boolean renewableDeepslate = false;

diff --git a/src/main/java/carpet/mixins/LavaFluid_renewableDeepslateMixin.java b/src/main/java/carpet/mixins/LavaFluid_renewableDeepslateMixin.java
@@ -22,7 +22,7 @@ public abstract class LavaFluid_renewableDeepslateMixin {
     @Inject(method = "spreadTo", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;defaultBlockState()Lnet/minecraft/world/level/block/state/BlockState;"), cancellable = true)
     private void generateDeepslate(LevelAccessor world, BlockPos pos, BlockState state, Direction direction, FluidState fluidState, CallbackInfo ci)
     {
-        if(CarpetSettings.renewableDeepslate && ((Level)world).dimension() == Level.OVERWORLD && pos.getY() < 16)
+        if(CarpetSettings.renewableDeepslate && ((Level)world).dimension() == Level.OVERWORLD && pos.getY() < 0)
         {
             world.setBlock(pos, Blocks.DEEPSLATE.defaultBlockState(), 3);
             this.fizz(world, pos);

diff --git a/src/main/java/carpet/mixins/LiquidBlock_renewableDeepslateMixin.java b/src/main/java/carpet/mixins/LiquidBlock_renewableDeepslateMixin.java
@@ -21,7 +21,7 @@ public abstract class LiquidBlock_renewableDeepslateMixin {
     @Inject(method = "shouldSpreadLiquid", at = @At(value = "INVOKE",target = "Lnet/minecraft/world/level/material/FluidState;isSource()Z"), cancellable = true)
     private void receiveFluidToDeepslate(Level world, BlockPos pos, BlockState state, CallbackInfoReturnable<Boolean> cir)
     {
-        if(CarpetSettings.renewableDeepslate && !world.getFluidState(pos).isSource() && world.dimension() == Level.OVERWORLD && pos.getY() < 16)
+        if(CarpetSettings.renewableDeepslate && !world.getFluidState(pos).isSource() && world.dimension() == Level.OVERWORLD && pos.getY() < 0)
         {
             world.setBlockAndUpdate(pos, Blocks.COBBLED_DEEPSLATE.defaultBlockState());
             this.fizz(world, pos);