Skip to content

Commit

Permalink
Update Fetchur solver (#363)
Browse files Browse the repository at this point in the history
- Log original message from Fetchur to console
- Moved "red and soft" to the end (changed on Aug 21, 2021).
  Not that it matters, just for consistency since the rest are in order.
- Updated "hot and gives energy" to also mention Black Coffee (per Hypixel and Fandom wikis)
- Updated "tall and can be opened" to also mention Iron Door (per Fandom wiki)
- Added emerald quest (added on Sep 26, 2023)
- Moved removed quests to the end
  • Loading branch information
qtlunya committed Oct 15, 2023
1 parent 4adf9e7 commit 150c9e4
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
import de.hysky.skyblocker.utils.chat.ChatPatternListener;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;

public class Fetchur extends ChatPatternListener {
private static final Logger LOGGER = LoggerFactory.getLogger(Fetchur.class);

private static final Map<String, String> answers;

public Fetchur() {
Expand All @@ -26,6 +30,7 @@ public ChatFilterResult state() {
public boolean onMatch(Text message, Matcher matcher) {
MinecraftClient client = MinecraftClient.getInstance();
if (client.player == null) return false;
LOGGER.info("Original Fetchur message: {}", message.getString());
String riddle = matcher.group(1);
String answer = answers.getOrDefault(riddle, riddle);
client.player.sendMessage(Text.of("§e[NPC] Fetchur§f: " + answer), false);
Expand All @@ -34,20 +39,27 @@ public boolean onMatch(Text message, Matcher matcher) {

static {
answers = new HashMap<>();
answers.put("red and soft", Text.translatable("block.minecraft.red_wool").getString());

answers.put("yellow and see through", Text.translatable("block.minecraft.yellow_stained_glass").getString());
answers.put("circular and sometimes moves", Text.translatable("item.minecraft.compass").getString());
// TODO remove when typo fixed by hypixel
answers.put("circlular and sometimes moves", Text.translatable("item.minecraft.compass").getString());
answers.put("expensive minerals", "Mithril");
answers.put("useful during celebrations", Text.translatable("item.minecraft.firework_rocket").getString());
answers.put("hot and gives energy", "Cheap / Decent Coffee");
answers.put("tall and can be opened", Text.translatable("block.minecraft.oak_door").getString());
answers.put("hot and gives energy", "Cheap / Decent / Black Coffee");
answers.put("tall and can be opened", String.format("%s / %s",
Text.translatable("block.minecraft.oak_door").getString(),
Text.translatable("block.minecraft.iron_door").getString()));
answers.put("brown and fluffy", Text.translatable("item.minecraft.rabbit_foot").getString());
answers.put("explosive but more than usual", "Superboom TNT");
answers.put("wearable and grows", Text.translatable("block.minecraft.pumpkin").getString());
answers.put("shiny and makes sparks", Text.translatable("item.minecraft.flint_and_steel").getString());
answers.put("red and white and you can mine it", Text.translatable("block.minecraft.nether_quartz_ore").getString());
answers.put("round and green, or purple", Text.translatable("item.minecraft.ender_pearl").getString());
answers.put("green and some dudes trade stuff for it", Text.translatable("item.minecraft.emerald").getString());
answers.put("red and soft", Text.translatable("block.minecraft.red_wool").getString());

// old riddles that should no longer be active
// TODO remove if not seen for a few months
answers.put("round and green, or purple", Text.translatable("item.minecraft.ender_pearl").getString()); // removed Aug 21, 2021
answers.put("red and white and you can mine it", Text.translatable("block.minecraft.nether_quartz_ore").getString()); // removed Sep 26, 2023
}
}

0 comments on commit 150c9e4

Please sign in to comment.