Merge pull request #16 from ExternalTime/fix-solvers

Small fixes to solvers

3 files changed, 18 insertions, 43 deletions

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"});
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
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..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,41 +19,18 @@ 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()) {
-            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");
-            message.append(z);
-            message.append("▲");
-        }
-        else if (z < 0) {
-            message.append("§a▼");
-            message.append(-z);
-            message.append("▼");
-        }
-        if(x > 0) {
-            message.append("§b");
-            message.append(x);
-            message.append("◀");
-        }
-        else if (x < 0) {
-            message.append("§5▶");
-            message.append(-x);
-            message.append("▶");
-        }
-
-        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