From 34379059b872db08e11c4a983fc8ad60750fca75 Mon Sep 17 00:00:00 2001 From: haykam821 <24855774+haykam821@users.noreply.github.com> Date: Sun, 3 Dec 2023 16:49:09 -0500 Subject: [PATCH] Allow lucky taters to break existing drops --- .../lobby/block/tater/LuckyTaterBlock.java | 63 ++++++++++++------- .../lobby/block/tater/LuckyTaterDropPos.java | 17 +++++ .../lobby/block/tater/LuckyTaterPhase.java | 27 ++++++++ 3 files changed, 83 insertions(+), 24 deletions(-) create mode 100644 src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterDropPos.java create mode 100644 src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterPhase.java diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterBlock.java index d1295f9..4c74973 100644 --- a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterBlock.java +++ b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterBlock.java @@ -15,7 +15,7 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager.Builder; -import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -31,7 +31,9 @@ import xyz.nucleoid.extras.util.SkinEncoder; public class LuckyTaterBlock extends CubicPotatoBlock { - private static final BooleanProperty COOLDOWN = BooleanProperty.of("cooldown"); + private static final EnumProperty PHASE = EnumProperty.of("phase", LuckyTaterPhase.class); + + private static final int COURAGE_TICKS = 5; private static final int COOLDOWN_TICKS = SharedConstants.TICKS_PER_MINUTE * 30; private static final Identifier LUCKY_TATER_DROPS_ID = NucleoidExtras.identifier("lucky_tater_drops"); @@ -43,7 +45,7 @@ public LuckyTaterBlock(Settings settings, String texture, String cooldownTexture super(settings, (ParticleEffect) null, texture); this.cooldownTexture = SkinEncoder.encode(cooldownTexture); - this.setDefaultState(this.stateManager.getDefaultState().with(COOLDOWN, false)); + this.setDefaultState(this.stateManager.getDefaultState().with(PHASE, LuckyTaterPhase.READY)); } @Override @@ -57,22 +59,29 @@ public ParticleEffect getPlayerParticleEffect(ServerPlayerEntity player) { @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (hand == Hand.OFF_HAND || this.isCoolingDown(state)) { + LuckyTaterPhase phase = state.get(PHASE); + + if (hand == Hand.OFF_HAND || phase != LuckyTaterPhase.READY) { return ActionResult.FAIL; } if (world instanceof ServerWorld serverWorld) { - Block drop = this.getDrop(serverWorld); - if (drop instanceof CubicPotatoBlock taterDrop) { - BlockPos dropPos = this.getDropPos(serverWorld, state, pos); - if (dropPos != null) { + LuckyTaterDropPos dropPos = this.getDropPos(serverWorld, state, pos); + + if (dropPos instanceof LuckyTaterDropPos.Blocked) { + world.setBlockState(pos, state.with(PHASE, LuckyTaterPhase.BUILDING_COURAGE)); + world.scheduleBlockTick(pos, this, COURAGE_TICKS); + } else { + Block drop = this.getDrop(serverWorld); + + if (drop instanceof CubicPotatoBlock taterDrop && dropPos instanceof LuckyTaterDropPos.Allowed allowed) { BlockState dropState = drop.getDefaultState(); if (dropState.contains(Properties.ROTATION)) { dropState = dropState.with(Properties.ROTATION, state.get(Properties.ROTATION)); } - world.setBlockState(dropPos, dropState); - + world.setBlockState(allowed.pos(), dropState); + // Spawn particles ParticleEffect particleEffect = taterDrop.getBlockParticleEffect(taterDrop.getDefaultState(), serverWorld, pos, player, hand, hit); this.spawnBlockParticles(serverWorld, pos, particleEffect); @@ -82,7 +91,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt world.playSound(null, pos, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.BLOCKS, 1, pitch); // Start cooldown - world.setBlockState(pos, state.with(COOLDOWN, true)); + world.setBlockState(pos, state.with(PHASE, LuckyTaterPhase.COOLDOWN)); world.scheduleBlockTick(pos, this, COOLDOWN_TICKS); } } @@ -113,7 +122,7 @@ private Block getDrop(ServerWorld world) { .orElse(null); } - private BlockPos getDropPos(ServerWorld world, BlockState state, BlockPos pos) { + private LuckyTaterDropPos getDropPos(ServerWorld world, BlockState state, BlockPos pos) { BlockPos.Mutable dropPos = pos.mutableCopy(); dropPos.move(Direction.DOWN); @@ -123,25 +132,31 @@ private BlockPos getDropPos(ServerWorld world, BlockState state, BlockPos pos) { for (int i = 0; i < 3; i++) { BlockState dropState = world.getBlockState(dropPos); if (dropState.getBlock() instanceof CubicPotatoBlock) { - return null; + return new LuckyTaterDropPos.Blocked(dropPos); } else if (dropState.isAir()) { - return dropPos; + return new LuckyTaterDropPos.Allowed(dropPos); } dropPos.move(Direction.UP); } - return null; - } - - private boolean isCoolingDown(BlockState state) { - return state.get(COOLDOWN); + return LuckyTaterDropPos.None.INSTANCE; } @Override public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { - if (this.isCoolingDown(state)) { - world.setBlockState(pos, state.with(COOLDOWN, false)); + LuckyTaterPhase phase = state.get(PHASE); + + if (phase == LuckyTaterPhase.BUILDING_COURAGE || phase == LuckyTaterPhase.COOLDOWN) { + if (phase == LuckyTaterPhase.BUILDING_COURAGE) { + LuckyTaterDropPos dropPos = this.getDropPos(world, state, pos); + + if (dropPos instanceof LuckyTaterDropPos.Blocked blocked) { + world.breakBlock(blocked.pos(), false); + } + } + + world.setBlockState(pos, state.with(PHASE, LuckyTaterPhase.READY)); } } @@ -152,18 +167,18 @@ public boolean hasComparatorOutput(BlockState state) { @Override public int getComparatorOutput(BlockState state, World world, BlockPos pos) { - return state.get(COOLDOWN) ? 15 : 0; + return state.get(PHASE).getComparatorOutput(); } @Override protected void appendProperties(Builder builder) { super.appendProperties(builder); - builder.add(COOLDOWN); + builder.add(PHASE); } @Override public String getPolymerSkinValue(BlockState state, BlockPos pos, ServerPlayerEntity player) { - return state.get(COOLDOWN) ? this.cooldownTexture : super.getPolymerSkinValue(state, pos, player); + return state.get(PHASE) == LuckyTaterPhase.COOLDOWN ? this.cooldownTexture : super.getPolymerSkinValue(state, pos, player); } private static int getRandomColor(Random random) { diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterDropPos.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterDropPos.java new file mode 100644 index 0000000..0800383 --- /dev/null +++ b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterDropPos.java @@ -0,0 +1,17 @@ +package xyz.nucleoid.extras.lobby.block.tater; + +import net.minecraft.util.math.BlockPos; + +public sealed interface LuckyTaterDropPos { + public record Allowed(BlockPos pos) implements LuckyTaterDropPos {} + + public record Blocked(BlockPos pos) implements LuckyTaterDropPos {} + + public final class None implements LuckyTaterDropPos { + public static final None INSTANCE = new None(); + + private None() { + return; + } + } +} diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterPhase.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterPhase.java new file mode 100644 index 0000000..441ca7e --- /dev/null +++ b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterPhase.java @@ -0,0 +1,27 @@ +package xyz.nucleoid.extras.lobby.block.tater; + +import net.minecraft.util.StringIdentifiable; + +public enum LuckyTaterPhase implements StringIdentifiable { + READY("ready", 0), + BUILDING_COURAGE("building_courage", 1), + COOLDOWN("cooldown", 15), + ; + + private final String name; + private final int comparatorOutput; + + private LuckyTaterPhase(String name, int comparatorOutput) { + this.name = name; + this.comparatorOutput = comparatorOutput; + } + + @Override + public String asString() { + return this.name; + } + + public int getComparatorOutput() { + return this.comparatorOutput; + } +}