Add bamboo in MC-13809 reintroduction.

2 files changed, 92 insertions, 1 deletions

diff --git a/gradle.properties b/gradle.properties
index 22f7834..6d6c014 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.16.4
 yarn_mappings=1.16.4+build.9
 loader_version=0.11.0
 # Mod Properties
-mod_version=1.5.1
+mod_version=1.5.2
 maven_group=com.keuin.omvm
 archives_base_name=oh-my-vanilla-mc
 # Dependencies
diff --git a/src/main/java/com/keuin/ohmyvanillamc/mixin/Mc113809BambooBlockMixin.java b/src/main/java/com/keuin/ohmyvanillamc/mixin/Mc113809BambooBlockMixin.java
new file mode 100644
index 0000000..2e0e274
--- /dev/null
+++ b/src/main/java/com/keuin/ohmyvanillamc/mixin/Mc113809BambooBlockMixin.java
@@ -0,0 +1,91 @@
+package com.keuin.ohmyvanillamc.mixin;
+
+import com.keuin.ohmyvanillamc.OhMyVanillaMinecraft;
+import net.minecraft.block.BambooBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.state.property.IntProperty;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Random;
+
+@Mixin(BambooBlock.class)
+public abstract class Mc113809BambooBlockMixin extends Block {
+
+    public Mc113809BambooBlockMixin(Settings settings) {
+        super(settings);
+    }
+
+    @Shadow
+    @Final
+    public static IntProperty STAGE;
+
+    @Shadow
+    protected abstract int countBambooBelow(BlockView world, BlockPos pos);
+
+    @Shadow
+    protected abstract void updateLeaves(BlockState state, World world, BlockPos pos, Random random, int height);
+
+    /**
+     * Reintroduce the MC-113809 glitch for bamboo. The implementation is identical to Minecraft 1.15.2.
+     *
+     * @author trueKeuin
+     * @reason reintroduce MC-113809 for bamboo.
+     */
+    @Overwrite
+    public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
+        if (!state.canPlaceAt(world, pos)) {
+            world.breakBlock(pos, true);
+        } else if (OhMyVanillaMinecraft.getConfiguration().isReintroduceZeroTickFarm()) {
+            realGrow(state, world, pos, random);
+        }
+    }
+
+    /**
+     * Reintroduce the base class's implementation.
+     *
+     * @reason reintroduce base class's implementation.
+     * @author trueKeuin
+     */
+    @Overwrite
+    public boolean hasRandomTicks(BlockState state) {
+        boolean zf = OhMyVanillaMinecraft.getConfiguration().isReintroduceZeroTickFarm();
+        return ((state.get(STAGE) == 0) && !zf) || (randomTicks && zf);
+    }
+
+    /**
+     * Revert to base class (Block) implementation of randomTick: just simply call scheduledTick.
+     * (both 1.15.2 and 1.16.4 are the same)
+     *
+     * @author trueKeuin
+     * @reason revert to the base class `Block` implementation.
+     */
+    @Overwrite
+    public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
+        if (OhMyVanillaMinecraft.getConfiguration().isReintroduceZeroTickFarm()) {
+            scheduledTick(state, world, pos, random);
+        } else {
+            realGrow(state, world, pos, random);
+        }
+
+    }
+
+    private void realGrow(BlockState state, ServerWorld world, BlockPos pos, Random random) {
+        if (state.get(STAGE) == 0) {
+            if (random.nextInt(3) == 0 && world.isAir(pos.up()) && world.getBaseLightLevel(pos.up(), 0) >= 9) {
+                int i = this.countBambooBelow(world, pos) + 1;
+                if (i < 16) {
+                    this.updateLeaves(state, world, pos, random, i);
+                }
+            }
+        }
+    }
+
+}