Merge pull request #724 from AzureAaron/simon-says

Simon Says Solver & Lights On Solver

7 files changed, 232 insertions, 5 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index f1eb4321..8dd1419d 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -14,6 +14,8 @@ import de.hysky.skyblocker.skyblock.chocolatefactory.TimeTowerReminder;
 import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
 import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra;
 import de.hysky.skyblocker.skyblock.dungeon.*;
+import de.hysky.skyblocker.skyblock.dungeon.device.LightsOn;
+import de.hysky.skyblocker.skyblock.dungeon.device.SimonSays;
 import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen;
 import de.hysky.skyblocker.skyblock.dungeon.puzzle.*;
 import de.hysky.skyblocker.skyblock.dungeon.puzzle.boulder.Boulder;
@@ -151,6 +153,8 @@ public class SkyblockerMod implements ClientModInitializer {
         Silverfish.init();
         IceFill.init();
         DungeonScore.init();
+        SimonSays.init();
+        LightsOn.init();
         PartyFinderScreen.initClass();
         ChestValue.init();
         FireFreezeStaffTimer.init();
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 28ace441..017e9186 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -269,6 +269,28 @@ public class DungeonsCategory {
                                 .build())
                         .build())
 
+                // Devices (F7/M7)
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.config.dungeons.devices"))
+                        .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.dungeons.devices.solveSimonSays"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.devices.solveSimonSays.@Tooltip")))
+                                .binding(defaults.dungeons.devices.solveSimonSays,
+                                        () -> config.dungeons.devices.solveSimonSays,
+                                        newValue -> config.dungeons.devices.solveSimonSays = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.dungeons.devices.solveLightsOn"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.devices.solveLightsOn.@Tooltip")))
+                                .binding(defaults.dungeons.devices.solveLightsOn,
+                                        () -> config.dungeons.devices.solveLightsOn,
+                                        newValue -> config.dungeons.devices.solveLightsOn = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .build())
+
                 // Dungeon Secret Waypoints
                 .group(OptionGroup.createBuilder()
                         .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints"))
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
index 7b394b53..1a0cad9d 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
@@ -42,6 +42,9 @@ public class DungeonsConfig {
     public Terminals terminals = new Terminals();
 
     @SerialEntry
+    public Devices devices = new Devices();
+
+    @SerialEntry
     public SecretWaypoints secretWaypoints = new SecretWaypoints();
 
     @SerialEntry
@@ -135,6 +138,14 @@ public class DungeonsConfig {
         public boolean blockIncorrectClicks = false;
     }
 
+    public static class Devices {
+        @SerialEntry
+        public boolean solveSimonSays = true;
+
+        @SerialEntry
+        public boolean solveLightsOn = true;
+    }
+
     public static class SecretWaypoints {
         @SerialEntry
         public boolean enableRoomMatching = true;
diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java
index 6c10e5d2..a2d7887b 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java
@@ -1,7 +1,7 @@
 package de.hysky.skyblocker.mixins;
 
-
 import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
+import de.hysky.skyblocker.skyblock.dungeon.device.SimonSays;
 import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.world.ClientWorld;
@@ -11,13 +11,21 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import com.llamalad7.mixinextras.sugar.Local;
+
 @Mixin(ClientWorld.class)
 public class ClientWorldMixin {
 
+	/**
+	 * @implNote The {@code pos} can be mutable when this is called by chunk delta updates, so if you want to copy it into memory
+	 * (e.g. store it in a field/list/map) make sure to duplicate it via {@link BlockPos#toImmutable()}.
+	 */
     @Inject(method = "handleBlockUpdate", at = @At("RETURN"))
-    private void skyblocker$handleBlockUpdate(BlockPos pos, BlockState state, int flags, CallbackInfo ci) {
+    private void skyblocker$handleBlockUpdate(CallbackInfo ci, @Local(argsOnly = true) BlockPos pos, @Local(argsOnly = true) BlockState state) {
         if (Utils.isInCrimson()) {
             DojoManager.onBlockUpdate(pos.toImmutable(), state);
         }
+
+        SimonSays.onBlockUpdate(pos, state);
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/device/LightsOn.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/device/LightsOn.java
new file mode 100644
index 00000000..555a8e4b
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/device/LightsOn.java
@@ -0,0 +1,46 @@
+package de.hysky.skyblocker.skyblock.dungeon.device;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.dungeon.DungeonBoss;
+import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
+import de.hysky.skyblocker.utils.ColorUtils;
+import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.render.RenderHelper;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.math.BlockPos;
+
+public class LightsOn {
+	private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+	private static final BlockPos TOP_LEFT = new BlockPos(62, 136, 142);
+	private static final BlockPos TOP_RIGHT = new BlockPos(58, 136, 142);
+	private static final BlockPos MIDDLE_TOP = new BlockPos(60, 135, 142);
+	private static final BlockPos MIDDLE_BOTTOM = new BlockPos(60, 134, 142);
+	private static final BlockPos BOTTOM_LEFT = new BlockPos(62, 133, 142);
+	private static final BlockPos BOTTOM_RIGHT = new BlockPos(58, 133, 142);
+	private static final BlockPos[] LEVERS = { TOP_LEFT, TOP_RIGHT, MIDDLE_TOP, MIDDLE_BOTTOM, BOTTOM_LEFT, BOTTOM_RIGHT };
+	private static final float[] RED = ColorUtils.getFloatComponents(DyeColor.RED);
+
+	public static void init() {
+		WorldRenderEvents.AFTER_TRANSLUCENT.register(LightsOn::render);
+	}
+
+	private static void render(WorldRenderContext context) {
+		if (SkyblockerConfigManager.get().dungeons.devices.solveLightsOn && Utils.isInDungeons() && DungeonManager.isInBoss() && DungeonManager.getBoss() == DungeonBoss.MAXOR) {
+			for (BlockPos lever : LEVERS) {
+				ClientWorld world = CLIENT.world;
+				BlockState state = world.getBlockState(lever);
+
+				if (state.getBlock().equals(Blocks.LEVER) && state.contains(Properties.POWERED) && !state.get(Properties.POWERED)) {
+					RenderHelper.renderFilled(context, lever, RED, 0.5f, false);
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/device/SimonSays.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/device/SimonSays.java
new file mode 100644
index 00000000..5aa97dd9
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/device/SimonSays.java
@@ -0,0 +1,122 @@
+package de.hysky.skyblocker.skyblock.dungeon.device;
+
+import java.util.Objects;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.dungeon.DungeonBoss;
+import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
+import de.hysky.skyblocker.utils.Boxes;
+import de.hysky.skyblocker.utils.ColorUtils;
+import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.render.RenderHelper;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import it.unimi.dsi.fastutil.objects.ObjectList;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import it.unimi.dsi.fastutil.objects.ObjectSet;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+
+public class SimonSays {
+	private static final Box BOARD_AREA = Box.enclosing(new BlockPos(111, 123, 92), new BlockPos(111, 120, 95));
+	private static final Box BUTTONS_AREA = Box.enclosing(new BlockPos(110, 123, 92), new BlockPos(110, 120, 95));
+	private static final BlockPos START_BUTTON = new BlockPos(110, 121, 91);
+	private static final float[] GREEN = ColorUtils.getFloatComponents(DyeColor.LIME);
+	private static final float[] YELLOW = ColorUtils.getFloatComponents(DyeColor.YELLOW);
+	private static final ObjectSet<BlockPos> CLICKED_BUTTONS = new ObjectOpenHashSet<>();
+	private static final ObjectList<BlockPos> SIMON_PATTERN = new ObjectArrayList<>();
+
+	public static void init() {
+		UseBlockCallback.EVENT.register(SimonSays::onBlockInteract);
+		ClientPlayConnectionEvents.JOIN.register((_handler, _sender, _client) -> reset());
+		WorldRenderEvents.AFTER_TRANSLUCENT.register(SimonSays::render);
+	}
+
+	//When another player is pressing the buttons hypixel doesnt send block or block state updates
+	//so you can't see it which means the solver can only count the buttons you press yourself
+	private static ActionResult onBlockInteract(PlayerEntity player, World world, Hand hand, BlockHitResult hitResult) {
+		if (shouldProcess()) {
+			BlockPos pos = hitResult.getBlockPos();
+			Block block = world.getBlockState(pos).getBlock();
+
+			if (block.equals(Blocks.STONE_BUTTON)) {
+				if (BUTTONS_AREA.contains(Vec3d.of(pos))) {
+					CLICKED_BUTTONS.add(new BlockPos(pos)); //Copy just in case it becomes mutable in the future
+				} else if (pos.equals(START_BUTTON)) {
+					reset();
+				}
+			}
+		}
+
+		//This could also be used to cancel incorrect clicks in the future
+		return ActionResult.PASS;
+	}
+
+	//If the player goes out of the range required to receive block/chunk updates then their solver won't detect stuff but that
+	//doesn't matter because if they're doing pre-4 or something they won't be doing the ss, and if they end up needing to they can
+	//just reset it or have the other person finish the current sequence first then let them do it.
+	public static void onBlockUpdate(BlockPos pos, BlockState state) {
+		if (shouldProcess()) {
+			Vec3d posVec = Vec3d.of(pos);
+			Block block = state.getBlock();
+
+			if (BOARD_AREA.contains(posVec) && block.equals(Blocks.SEA_LANTERN)) {
+				SIMON_PATTERN.add(pos.toImmutable()); //Convert to immutable because chunk delta updates use the mutable variant
+			} else if (BUTTONS_AREA.contains(posVec) && block.equals(Blocks.AIR)) {
+				//Upon reaching the showing of the next sequence we need to reset the state so that we don't show old data
+				//Otherwise, the nextIndex will go beyond 5 and that can cause bugs, it also helps with the other case noted above
+				reset();
+			}
+		}
+	}
+
+	private static void render(WorldRenderContext context) {
+		if (shouldProcess()) {
+			int buttonsRendered = 0;
+
+			for (BlockPos pos : SIMON_PATTERN) {
+				//Offset to west (x - 1) to get the position of the button from the sea lantern block
+				BlockPos buttonPos = pos.west();
+				ClientWorld world = Objects.requireNonNull(MinecraftClient.getInstance().world); //Should never be null here
+				BlockState state = world.getBlockState(buttonPos);
+
+				//If the button hasn't been clicked yet
+				//Also don't do anything if the button isn't there which means the device is showing the sequence
+				if (!CLICKED_BUTTONS.contains(buttonPos) && state.getBlock().equals(Blocks.STONE_BUTTON)) {
+					Box outline = RenderHelper.getBlockBoundingBox(world, state, buttonPos);
+					float[] colour = buttonsRendered == 0 ? GREEN : YELLOW;
+
+					RenderHelper.renderFilled(context, Boxes.getMinVec(outline), Boxes.getLengthVec(outline), colour, 0.5f, true);
+					RenderHelper.renderOutline(context, outline, colour, 5f, true);
+
+					if (++buttonsRendered == 2) return;
+				}
+			}
+		}
+	}
+
+	private static boolean shouldProcess() {
+		return SkyblockerConfigManager.get().dungeons.devices.solveSimonSays &&
+				Utils.isInDungeons() && DungeonManager.isInBoss() && DungeonManager.getBoss() == DungeonBoss.MAXOR;
+	}
+
+	private static void reset() {
+		CLICKED_BUTTONS.clear();
+		SIMON_PATTERN.clear();
+	}
+}
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
index a5b9bf6b..1b16b138 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
@@ -11,6 +11,7 @@ import de.hysky.skyblocker.utils.render.title.TitleContainer;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.event.Event;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
@@ -20,6 +21,7 @@ import net.minecraft.client.texture.Scaling;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.BufferAllocator;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
@@ -64,18 +66,22 @@ public class RenderHelper {
     }
 
     public static void renderFilled(WorldRenderContext context, BlockPos pos, Vec3d dimensions, float[] colorComponents, float alpha, boolean throughWalls) {
+        renderFilled(context, Vec3d.of(pos), dimensions, colorComponents, alpha, throughWalls);
+    }
+
+    public static void renderFilled(WorldRenderContext context, Vec3d pos, Vec3d dimensions, float[] colorComponents, float alpha, boolean throughWalls) {
         if (throughWalls) {
             if (FrustumUtils.isVisible(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + dimensions.x, pos.getY() + dimensions.y, pos.getZ() + dimensions.z)) {
-                renderFilled(context, Vec3d.of(pos), dimensions, colorComponents, alpha, true);
+            	renderFilledInternal(context, pos, dimensions, colorComponents, alpha, true);
             }
         } else {
             if (OcclusionCulling.getRegularCuller().isVisible(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + dimensions.x, pos.getY() + dimensions.y, pos.getZ() + dimensions.z)) {
-                renderFilled(context, Vec3d.of(pos), dimensions, colorComponents, alpha, false);
+            	renderFilledInternal(context, pos, dimensions, colorComponents, alpha, false);
             }
         }
     }
 
-    private static void renderFilled(WorldRenderContext context, Vec3d pos, Vec3d dimensions, float[] colorComponents, float alpha, boolean throughWalls) {
+    private static void renderFilledInternal(WorldRenderContext context, Vec3d pos, Vec3d dimensions, float[] colorComponents, float alpha, boolean throughWalls) {
         MatrixStack matrices = context.matrixStack();
         Vec3d camera = context.camera().getPos();
 
@@ -330,6 +336,14 @@ public class RenderHelper {
         }
     }
 
+    public static Box getBlockBoundingBox(ClientWorld world, BlockPos pos) {
+        return getBlockBoundingBox(world, world.getBlockState(pos), pos);
+    }
+
+    public static Box getBlockBoundingBox(ClientWorld world, BlockState state, BlockPos pos) {
+        return state.getOutlineShape(world, pos).asCuboid().getBoundingBox().offset(pos);
+    }
+
     /**
      * Adds the title to {@link TitleContainer} and {@link #playNotificationSound() plays the notification sound} if the title is not in the {@link TitleContainer} already.
      * No checking needs to be done on whether the title is in the {@link TitleContainer} already by the caller.