Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Fetchur solver #363

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Update Fetchur solver #363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
View file
Open in desktop
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
}
}