From eda82a49b1c8e940647619d4c49d1b9747fb9f58 Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:25:56 +0200 Subject: Updated the number of minions for trivia solver --- src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java index 3d3e5c28..bb3d10d2 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java @@ -79,7 +79,7 @@ public class Trivia extends ChatListener { answers.put("What is the name of the person that upgrades pets?", new String[]{"Kat"}); answers.put("What is the name of the lady of the Nether?", new String[]{"Elle"}); answers.put("Which villager in the Village gives you a Rogue Sword?", new String[]{"Jamie"}); - answers.put("How many unique minions are there?", new String[]{"53 Minions"}); + answers.put("How many unique minions are there?", new String[]{"55 Minions"}); answers.put("Which of these enemies does not spawn in the Spider's Den?", new String[]{"Zombie Spider", "Cave Spider", "Wither Skeleton", "Dashing Spooder", "Broodfather", "Night Spider"}); answers.put("Which of these monsters only spawns at night?", new String[]{"Zombie Villager", "Ghast"}); -- cgit From 6e54c682ce3fd259ac1881418a744bba4a08b1c7 Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 20 Sep 2021 15:13:28 +0200 Subject: Fixed puzzler solver --- .../skyblocker/skyblock/dwarven/Puzzler.java | 37 ++++++++++------------ 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java index 377ffbf4..c50e58b0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java @@ -19,34 +19,31 @@ public class Puzzler extends ChatListener { public boolean onMessage(String[] groups) { int x = 0; int z = 0; + System.out.println(groups[1]); for (char c : groups[1].toCharArray()) { - switch (c) { - case '▲': z += 1; - case '▶': x -= 1; - case '▼': z -= 1; - case '◀': x += 1; - } + if (c == '▲') z++; + else if (c == '▼') z--; + else if (c == '◀') x++; + else if (c == '▶') x--; } StringBuilder message = new StringBuilder("§e[NPC] §dPuzzler§f: "); - if(z > 0) { - message.append("§d"); + if (z > 0) { + message.append("§a"); message.append(z); - message.append("▲"); - } - else if (z < 0) { - message.append("§a▼"); + message.append("§d▲"); + } else if (z < 0) { + message.append("§d"); message.append(-z); - message.append("▼"); + message.append("§a▼"); } - if(x > 0) { - message.append("§b"); + if (x > 0) { + message.append("§5"); message.append(x); - message.append("◀"); - } - else if (x < 0) { - message.append("§5▶"); + message.append("§b◀"); + } else if (x < 0) { + message.append("§b"); message.append(-x); - message.append("▶"); + message.append("§5▶"); } MinecraftClient client = MinecraftClient.getInstance(); -- cgit From c865cfdbfe042df6937a7a83a278c9409998c050 Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Mon, 20 Sep 2021 15:13:49 +0200 Subject: Fixed some Fetchur hints --- .../java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java index 0051e1dd..c6b5be9e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java @@ -31,23 +31,19 @@ public class Fetchur extends ChatListener { } static { - //It seems that hints on wiki aren't up to date. - //I will assume doors weren't the only ones changed - //and that admins did it to make hints more consistent. - //Will need to verify if this true. - //Changed most commas into "and"s. answers = new HashMap<>(); + answers.put("red and soft", new TranslatableText("block.minecraft.red_wool").getString()); answers.put("yellow and see-through", new TranslatableText("block.minecraft.yellow_stained_glass").getString()); answers.put("circular and sometimes moves", new TranslatableText("item.minecraft.compass").getString()); answers.put("expensive minerals", "Mithril"); answers.put("useful during celebrations", new TranslatableText("item.minecraft.firework_rocket").getString()); answers.put("hot and gives energy", "Cheap / Decent Coffee"); answers.put("tall and can be opened", new TranslatableText("block.minecraft.oak_door").getString()); - answers.put("explosive, more than usual", "Superboom TNT"); + answers.put("brown and fluffy", new TranslatableText("item.minecraft.rabbit_foot").getString()); + answers.put("explosive but more than usual", "Superboom TNT"); answers.put("wearable and grows", new TranslatableText("block.minecraft.pumpkin").getString()); answers.put("shiny and makes sparks", new TranslatableText("item.minecraft.flint_and_steel").getString()); answers.put("red and white and you can mine it", new TranslatableText("block.minecraft.nether_quartz_ore").getString()); answers.put("round and green, or purple", new TranslatableText("item.minecraft.ender_pearl").getString()); - answers.put("red and Soft", new TranslatableText("block.minecraft.red_wool").getString()); } } \ No newline at end of file -- cgit From e62ff207433e75355d534a7b63a64ff48f61f6a8 Mon Sep 17 00:00:00 2001 From: ExternalTime <84183548+ExternalTime@users.noreply.github.com> Date: Fri, 24 Sep 2021 13:57:34 +0200 Subject: Reverted puzzler to show solution by replacing correct block --- .../skyblocker/skyblock/dwarven/Puzzler.java | 36 ++++++---------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java index c50e58b0..e95a7507 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java @@ -2,8 +2,10 @@ package me.xmrvizzy.skyblocker.skyblock.dwarven; import me.xmrvizzy.skyblocker.chat.ChatListener; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; -import net.minecraft.text.Text; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.util.math.BlockPos; public class Puzzler extends ChatListener { public Puzzler() { @@ -17,8 +19,8 @@ public class Puzzler extends ChatListener { @Override public boolean onMessage(String[] groups) { - int x = 0; - int z = 0; + int x = 181; + int z = 135; System.out.println(groups[1]); for (char c : groups[1].toCharArray()) { if (c == '▲') z++; @@ -26,29 +28,9 @@ public class Puzzler extends ChatListener { else if (c == '◀') x++; else if (c == '▶') x--; } - StringBuilder message = new StringBuilder("§e[NPC] §dPuzzler§f: "); - if (z > 0) { - message.append("§a"); - message.append(z); - message.append("§d▲"); - } else if (z < 0) { - message.append("§d"); - message.append(-z); - message.append("§a▼"); - } - if (x > 0) { - message.append("§5"); - message.append(x); - message.append("§b◀"); - } else if (x < 0) { - message.append("§b"); - message.append(-x); - message.append("§5▶"); - } - - MinecraftClient client = MinecraftClient.getInstance(); - assert client.player != null; - client.player.sendMessage(Text.of(message.toString()), false); - return true; + ClientWorld world = MinecraftClient.getInstance().world; + assert world != null; + world.setBlockStateWithoutNeighborUpdates(new BlockPos(x, 195, z), Blocks.CRIMSON_PLANKS.getDefaultState()); + return false; } } \ No newline at end of file -- cgit