From 0653f9fba555abb0b1686276aaea55734cc3fc2a Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Wed, 20 Oct 2021 00:47:21 +0200 Subject: [PATCH] Added feature changing lever hitboxes to ones from 1.8 --- .../skyblocker/config/SkyblockerConfig.java | 1 + .../skyblocker/mixin/LeverBlockMixin.java | 31 +++++++++++++ .../skyblocker/skyblock/dungeon/OldLever.java | 44 +++++++++++++++++++ .../assets/skyblocker/lang/en_us.json | 1 + src/main/resources/skyblocker.mixins.json | 3 +- 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/mixin/LeverBlockMixin.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index dd5190e5db..74cff22695 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -54,6 +54,7 @@ public static class Dungeons { public boolean solveThreeWeirdos = true; public boolean blazesolver = true; public boolean solveTrivia = true; + public boolean oldLevers = false; @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public Terminals terminals = new Terminals(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/LeverBlockMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/LeverBlockMixin.java new file mode 100644 index 0000000000..f1c6661d44 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/LeverBlockMixin.java @@ -0,0 +1,31 @@ +package me.xmrvizzy.skyblocker.mixin; + +import me.xmrvizzy.skyblocker.skyblock.dungeon.OldLever; +import me.xmrvizzy.skyblocker.utils.Utils; +import net.minecraft.block.BlockState; +import net.minecraft.block.LeverBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.WallMountedBlock; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(LeverBlock.class) +public abstract class LeverBlockMixin extends WallMountedBlock { + protected LeverBlockMixin(Settings settings) { + super(settings); + } + + @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true) + public void onGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + if (Utils.isSkyblock) { + VoxelShape shape = OldLever.getShape(state.get(FACE), state.get(FACING)); + if (shape != null) + cir.setReturnValue(shape); + } + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java new file mode 100644 index 0000000000..fc26f91323 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java @@ -0,0 +1,44 @@ +package me.xmrvizzy.skyblocker.skyblock.dungeon; + +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.block.Block; +import net.minecraft.block.enums.WallMountLocation; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; + +public class OldLever { + protected static final VoxelShape FLOOR_SHAPE; + protected static final VoxelShape NORTH_SHAPE; + protected static final VoxelShape SOUTH_SHAPE; + protected static final VoxelShape EAST_SHAPE; + protected static final VoxelShape WEST_SHAPE; + + public static VoxelShape getShape(WallMountLocation wallMountLocation, Direction direction) { + if (!SkyblockerConfig.get().locations.dungeons.oldLevers) + return null; + + if (wallMountLocation == WallMountLocation.FLOOR) { + return FLOOR_SHAPE; + } else if (wallMountLocation == WallMountLocation.WALL) { + switch (direction) { + case EAST: + return EAST_SHAPE; + case WEST: + return WEST_SHAPE; + case SOUTH: + return SOUTH_SHAPE; + case NORTH: + return NORTH_SHAPE; + } + } + return null; + } + + static { + FLOOR_SHAPE = Block.createCuboidShape(4, 0, 4, 12, 10, 12); + NORTH_SHAPE = Block.createCuboidShape(5.0D, 3.0D, 10.0D, 11.0D, 13.0D, 16.0D); + SOUTH_SHAPE = Block.createCuboidShape(5.0D, 3.0D, 0.0D, 11.0D, 13.0D, 6.0D); + WEST_SHAPE = Block.createCuboidShape(10.0D, 3.0D, 5.0D, 16.0D, 13.0D, 11.0D); + EAST_SHAPE = Block.createCuboidShape(0.0D, 3.0D, 5.0D, 6.0D, 13.0D, 11.0D); + } +} diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 2568fecb2c..a1f0198e47 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -15,6 +15,7 @@ "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle", + "text.autoconfig.skyblocker.option.locations.dungeons.oldLevers": "1.8 lever hitbox", "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Solvers", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Solve Select Colored", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Solve Click In Order", diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index acf0ef4519..bfc6b0f262 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -11,7 +11,8 @@ "MinecraftClientMixin", "AccessorWorldRenderer", "GenericContainerScreenMixin", - "GenericContainerScreenHandlerMixin" + "GenericContainerScreenHandlerMixin", + "LeverBlockMixin" ], "injectors": { "defaultRequire": 1