From 95a38421519af165344b2b5a05c9898ce3b7e8a1 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:19:41 -0400 Subject: Add adjustable dungeon map scaling --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 1 + .../java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 21322c81..d41a1062 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -252,6 +252,7 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.Tooltip() public final boolean croesusHelper = true; public final boolean enableMap = true; + public final float mapScaling = 1f; public final boolean solveThreeWeirdos = true; public final boolean blazesolver = true; public final boolean solveTrivia = true; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java index e0158bc5..dda8da41 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java @@ -1,5 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; +import org.apache.commons.lang3.StringUtils; + +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.MapRenderer; import net.minecraft.client.render.VertexConsumerProvider; @@ -8,7 +11,6 @@ import net.minecraft.item.FilledMapItem; import net.minecraft.item.ItemStack; import net.minecraft.item.map.MapState; import net.minecraft.nbt.NbtCompound; -import org.apache.commons.lang3.StringUtils; public class DungeonMap { @@ -25,11 +27,12 @@ public class DungeonMap { VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers(); MapRenderer map = client.gameRenderer.getMapRenderer(); MapState state = FilledMapItem.getMapState(mapid, client.world); + float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling; if (state == null) return; matrices.push(); matrices.translate(2, 2, 0); - matrices.scale(1, 1, 0); + matrices.scale(scaling, scaling, 0f); map.draw( matrices, vertices, mapid, state, false, 15728880); vertices.draw(); matrices.pop(); -- cgit From 4ceeff21a1afcced4f1b00031aaa1a2ceab8d6a2 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:20:08 -0400 Subject: Eclipse decided not to commit this .-. --- src/main/resources/assets/skyblocker/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 8e7e4041..3e4ab9b9 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -60,6 +60,7 @@ "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Croesus Helper", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Gray out chests that have already been opened.", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Enable Map", + "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Map Scaling", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle", -- cgit From 447b0558aa57b4fae036186a58e980f2969b5890 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:44:16 -0400 Subject: Remove final modifier --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index d41a1062..35786397 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -252,7 +252,7 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.Tooltip() public final boolean croesusHelper = true; public final boolean enableMap = true; - public final float mapScaling = 1f; + public float mapScaling = 1f; public final boolean solveThreeWeirdos = true; public final boolean blazesolver = true; public final boolean solveTrivia = true; -- cgit From 682bb4acccb7bc2aba0ee3cd1a152cfb6662207a Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 18:02:05 +0200 Subject: create the treasure hunter solver --- .../skyblocker/chat/ChatMessageListener.java | 2 + .../skyblocker/config/SkyblockerConfig.java | 8 +++ .../skyblocker/skyblock/barn/TreasureHunter.java | 60 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java index 2e23bf31..28c5331c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java @@ -7,6 +7,7 @@ import me.xmrvizzy.skyblocker.skyblock.dungeon.ThreeWeirdos; import me.xmrvizzy.skyblocker.skyblock.dungeon.Trivia; import me.xmrvizzy.skyblocker.skyblock.dwarven.Fetchur; import me.xmrvizzy.skyblocker.skyblock.dwarven.Puzzler; +import me.xmrvizzy.skyblocker.skyblock.barn.TreasureHunter; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.text.Text; @@ -30,6 +31,7 @@ public interface ChatMessageListener { new Reparty(), new ThreeWeirdos(), new Trivia(), + new TreasureHunter(), // Filters new AbilityFilter(), new AdFilter(), diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index a13f86b3..8e56d218 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -246,6 +246,10 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("dwarvenmines") @ConfigEntry.Gui.CollapsibleObject() public DwarvenMines dwarvenMines = new DwarvenMines(); + + @ConfigEntry.Category("barn") + @ConfigEntry.Gui.CollapsibleObject(startExpanded = false) + public Barn barn = new Barn(); } public static class Dungeons { @@ -280,6 +284,10 @@ public class SkyblockerConfig implements ConfigData { public int y = 10; } + public static class Barn { + public boolean solveTreasureHunter = true; + } + public static class Messages { @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) public ChatFilterResult hideAbility = ChatFilterResult.PASS; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java new file mode 100644 index 00000000..faf20c08 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -0,0 +1,60 @@ +package me.xmrvizzy.skyblocker.skyblock.barn; + +import me.xmrvizzy.skyblocker.chat.ChatFilterResult; +import me.xmrvizzy.skyblocker.chat.ChatPatternListener; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; + +public class TreasureHunter extends ChatPatternListener { + + private static final Map locations; + + public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-.]*)$"); } + + @Override + public ChatFilterResult state() { + return SkyblockerConfig.get().locations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + } + + @Override + public boolean onMatch(Text message, Matcher matcher) { + MinecraftClient client = MinecraftClient.getInstance(); + if (client.player == null) return false; + String hint = matcher.group(1); + String location = locations.getOrDefault(hint, hint); + client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: " + location), false); + return true; + } + + static { + locations = new HashMap<>(); + locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "256 70 -490"); + locations.put("I was in the desert earlier, and I saw something near a red sand rock.", "357 82 -319"); + locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house.", "259 184 -564"); + locations.put("There's a small house in the gorge, I saw some treasure near there.", "297 87 -562"); + locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut.", "392 85 -372"); + locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out.", "305 73 -557"); + locations.put("There are some small ruins out in the desert, might want to check it out.", "320 102 -471"); + locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there.", "234 56 -410"); + locations.put("There some old stone structures in the Mushroom Gorge, give it a look.", "223 54 -503"); + locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for.", "205 42 -527"); + locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there.", "334 82 -389"); + locations.put("There's a single piece of tall grass growing in the desert, I saw something there.", "283 76 -363"); + locations.put("I saw some treasure by a cow skull near the village.", "141 77 -397"); + locations.put("Near a melon patch inside a tunnel in the mountain I spotted something.", "257 100 -569"); + locations.put("I saw something near a farmer's cart, you should check it out.", "155 90 -591"); + locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there.", "122 66 -409"); + locations.put("I thought I saw something near the smallest stone pillar in the oasis.", "94 65 -455"); + locations.put("I found something by a mossy stone pillar in the oasis, you should taking a look.", "179 93 -537"); + locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out.", "182 44 -451"); + locations.put("Something caught my eye by the red sand near the bridge over the gorge.", "306 105 -489"); + locations.put("I seem to recall seeing something near the well in the village.", "170 77 -375"); + locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge.", "142 69 -448"); + locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones.", "188 77 -459"); + } +} \ No newline at end of file -- cgit From 40708e905c703e912761a00b4caf0d6f8c080524 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 18:13:08 +0200 Subject: smol changes --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 8e56d218..7559902a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -248,7 +248,7 @@ public class SkyblockerConfig implements ConfigData { public DwarvenMines dwarvenMines = new DwarvenMines(); @ConfigEntry.Category("barn") - @ConfigEntry.Gui.CollapsibleObject(startExpanded = false) + @ConfigEntry.Gui.CollapsibleObject() public Barn barn = new Barn(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index faf20c08..2fd5d4d3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -27,7 +27,7 @@ public class TreasureHunter extends ChatPatternListener { if (client.player == null) return false; String hint = matcher.group(1); String location = locations.getOrDefault(hint, hint); - client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: " + location), false); + client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location), false); return true; } -- cgit From a44f7bf5336204ff2b39398d8750f0a25331ceb4 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 21:09:42 +0200 Subject: try to fix the regex --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index 2fd5d4d3..a146cc81 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -14,7 +14,7 @@ public class TreasureHunter extends ChatPatternListener { private static final Map locations; - public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-.]*)$"); } + public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-]*)\\.$"); } @Override public ChatFilterResult state() { -- cgit From 9d49b7f872091d8a04e12d5c80175a727a6ce82c Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 21:20:49 +0200 Subject: final fix --- .../skyblocker/skyblock/barn/TreasureHunter.java | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index a146cc81..8bbfeeb3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -33,28 +33,28 @@ public class TreasureHunter extends ChatPatternListener { static { locations = new HashMap<>(); - locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "256 70 -490"); - locations.put("I was in the desert earlier, and I saw something near a red sand rock.", "357 82 -319"); - locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house.", "259 184 -564"); - locations.put("There's a small house in the gorge, I saw some treasure near there.", "297 87 -562"); - locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut.", "392 85 -372"); - locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out.", "305 73 -557"); - locations.put("There are some small ruins out in the desert, might want to check it out.", "320 102 -471"); - locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there.", "234 56 -410"); - locations.put("There some old stone structures in the Mushroom Gorge, give it a look.", "223 54 -503"); - locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for.", "205 42 -527"); - locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there.", "334 82 -389"); - locations.put("There's a single piece of tall grass growing in the desert, I saw something there.", "283 76 -363"); - locations.put("I saw some treasure by a cow skull near the village.", "141 77 -397"); - locations.put("Near a melon patch inside a tunnel in the mountain I spotted something.", "257 100 -569"); - locations.put("I saw something near a farmer's cart, you should check it out.", "155 90 -591"); - locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there.", "122 66 -409"); - locations.put("I thought I saw something near the smallest stone pillar in the oasis.", "94 65 -455"); - locations.put("I found something by a mossy stone pillar in the oasis, you should taking a look.", "179 93 -537"); - locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out.", "182 44 -451"); - locations.put("Something caught my eye by the red sand near the bridge over the gorge.", "306 105 -489"); - locations.put("I seem to recall seeing something near the well in the village.", "170 77 -375"); - locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge.", "142 69 -448"); - locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones.", "188 77 -459"); + locations.put("There's a treasure chest somewhere in a small cave in the gorge", "256 70 -490"); + locations.put("I was in the desert earlier, and I saw something near a red sand rock", "357 82 -319"); + locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house", "259 184 -564"); + locations.put("There's a small house in the gorge, I saw some treasure near there", "297 87 -562"); + locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut", "392 85 -372"); + locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out", "305 73 -557"); + locations.put("There are some small ruins out in the desert, might want to check it out", "320 102 -471"); + locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there", "234 56 -410"); + locations.put("There some old stone structures in the Mushroom Gorge, give it a look", "223 54 -503"); + locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for", "205 42 -527"); + locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there", "334 82 -389"); + locations.put("There's a single piece of tall grass growing in the desert, I saw something there", "283 76 -363"); + locations.put("I saw some treasure by a cow skull near the village", "141 77 -397"); + locations.put("Near a melon patch inside a tunnel in the mountain I spotted something", "257 100 -569"); + locations.put("I saw something near a farmer's cart, you should check it out", "155 90 -591"); + locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there", "122 66 -409"); + locations.put("I thought I saw something near the smallest stone pillar in the oasis", "94 65 -455"); + locations.put("I found something by a mossy stone pillar in the oasis, you should taking a look", "179 93 -537"); + locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out", "182 44 -451"); + locations.put("Something caught my eye by the red sand near the bridge over the gorge", "306 105 -489"); + locations.put("I seem to recall seeing something near the well in the village", "170 77 -375"); + locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge", "142 69 -448"); + locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones", "188 77 -459"); } } \ No newline at end of file -- cgit From f34a7eb51e12ce45f4424bfd6ae583870435c35a Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 21:31:34 +0200 Subject: final fix fr this time thanks for this part ! Co-Authored-By: ExternalTime <84183548+ExternalTime@users.noreply.github.com> --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index 8bbfeeb3..731f746e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -26,7 +26,8 @@ public class TreasureHunter extends ChatPatternListener { MinecraftClient client = MinecraftClient.getInstance(); if (client.player == null) return false; String hint = matcher.group(1); - String location = locations.getOrDefault(hint, hint); + String location = locations.get(hint); + if (location == null) return false; client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location), false); return true; } -- cgit From 71df5972db63a032efe919d6620cc98054a90e4a Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 21:42:29 +0200 Subject: fix one sentence which is wrong on the official wiki --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index 731f746e..b7718cd1 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -42,7 +42,7 @@ public class TreasureHunter extends ChatPatternListener { locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out", "305 73 -557"); locations.put("There are some small ruins out in the desert, might want to check it out", "320 102 -471"); locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there", "234 56 -410"); - locations.put("There some old stone structures in the Mushroom Gorge, give it a look", "223 54 -503"); + locations.put("There are some old stone structures in the Mushroom Gorge, give them a look", "223 54 -503"); locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for", "205 42 -527"); locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there", "334 82 -389"); locations.put("There's a single piece of tall grass growing in the desert, I saw something there", "283 76 -363"); -- cgit From 02563e9af133fb92951e37ed9c54d9609c8597b4 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 22:14:54 +0200 Subject: fix official wiki again --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index b7718cd1..1612badb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -51,7 +51,7 @@ public class TreasureHunter extends ChatPatternListener { locations.put("I saw something near a farmer's cart, you should check it out", "155 90 -591"); locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there", "122 66 -409"); locations.put("I thought I saw something near the smallest stone pillar in the oasis", "94 65 -455"); - locations.put("I found something by a mossy stone pillar in the oasis, you should taking a look", "179 93 -537"); + locations.put("I found something by a mossy stone pillar in the oasis, you should take a look", "179 93 -537"); locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out", "182 44 -451"); locations.put("Something caught my eye by the red sand near the bridge over the gorge", "306 105 -489"); locations.put("I seem to recall seeing something near the well in the village", "170 77 -375"); -- cgit From 255c60e9e9334c74e6a2f62445aedf7596ccecf4 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 8 Apr 2023 22:22:07 +0200 Subject: modified the regex to make more sense i moved back the dot in the group 1 (but outside of the [] this time and added back dots at the end of the strings in hashmap) --- .../skyblocker/skyblock/barn/TreasureHunter.java | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index 1612badb..e7c8ff36 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -14,7 +14,7 @@ public class TreasureHunter extends ChatPatternListener { private static final Map locations; - public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-]*)\\.$"); } + public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-]*\\.)$"); } @Override public ChatFilterResult state() { @@ -34,28 +34,28 @@ public class TreasureHunter extends ChatPatternListener { static { locations = new HashMap<>(); - locations.put("There's a treasure chest somewhere in a small cave in the gorge", "256 70 -490"); - locations.put("I was in the desert earlier, and I saw something near a red sand rock", "357 82 -319"); - locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house", "259 184 -564"); - locations.put("There's a small house in the gorge, I saw some treasure near there", "297 87 -562"); - locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut", "392 85 -372"); - locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out", "305 73 -557"); - locations.put("There are some small ruins out in the desert, might want to check it out", "320 102 -471"); - locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there", "234 56 -410"); - locations.put("There are some old stone structures in the Mushroom Gorge, give them a look", "223 54 -503"); - locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for", "205 42 -527"); - locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there", "334 82 -389"); - locations.put("There's a single piece of tall grass growing in the desert, I saw something there", "283 76 -363"); - locations.put("I saw some treasure by a cow skull near the village", "141 77 -397"); - locations.put("Near a melon patch inside a tunnel in the mountain I spotted something", "257 100 -569"); - locations.put("I saw something near a farmer's cart, you should check it out", "155 90 -591"); - locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there", "122 66 -409"); - locations.put("I thought I saw something near the smallest stone pillar in the oasis", "94 65 -455"); - locations.put("I found something by a mossy stone pillar in the oasis, you should take a look", "179 93 -537"); - locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out", "182 44 -451"); - locations.put("Something caught my eye by the red sand near the bridge over the gorge", "306 105 -489"); - locations.put("I seem to recall seeing something near the well in the village", "170 77 -375"); - locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge", "142 69 -448"); - locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones", "188 77 -459"); + locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "256 70 -490"); + locations.put("I was in the desert earlier, and I saw something near a red sand rock.", "357 82 -319"); + locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house.", "259 184 -564"); + locations.put("There's a small house in the gorge, I saw some treasure near there.", "297 87 -562"); + locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut.", "392 85 -372"); + locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out.", "305 73 -557"); + locations.put("There are some small ruins out in the desert, might want to check it out.", "320 102 -471"); + locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there.", "234 56 -410"); + locations.put("There are some old stone structures in the Mushroom Gorge, give them a look.", "223 54 -503"); + locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for.", "205 42 -527"); + locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there.", "334 82 -389"); + locations.put("There's a single piece of tall grass growing in the desert, I saw something there.", "283 76 -363"); + locations.put("I saw some treasure by a cow skull near the village.", "141 77 -397"); + locations.put("Near a melon patch inside a tunnel in the mountain I spotted something.", "257 100 -569"); + locations.put("I saw something near a farmer's cart, you should check it out.", "155 90 -591"); + locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there.", "122 66 -409"); + locations.put("I thought I saw something near the smallest stone pillar in the oasis.", "94 65 -455"); + locations.put("I found something by a mossy stone pillar in the oasis, you should take a look.", "179 93 -537"); + locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out.", "182 44 -451"); + locations.put("Something caught my eye by the red sand near the bridge over the gorge.", "306 105 -489"); + locations.put("I seem to recall seeing something near the well in the village.", "170 77 -375"); + locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge.", "142 69 -448"); + locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones.", "188 77 -459"); } } \ No newline at end of file -- cgit From da9b635382694f996a3ff695aec48a57d0b04c25 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sun, 9 Apr 2023 01:02:53 +0200 Subject: Hungry Hiker solver --- .../skyblocker/chat/ChatMessageListener.java | 2 + .../skyblocker/config/SkyblockerConfig.java | 1 + .../skyblocker/skyblock/barn/HungryHiker.java | 47 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java index 28c5331c..9ee87f2b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java @@ -2,6 +2,7 @@ package me.xmrvizzy.skyblocker.chat; import me.xmrvizzy.skyblocker.chat.filters.*; import me.xmrvizzy.skyblocker.skyblock.api.ApiKeyListener; +import me.xmrvizzy.skyblocker.skyblock.barn.HungryHiker; import me.xmrvizzy.skyblocker.skyblock.dungeon.Reparty; import me.xmrvizzy.skyblocker.skyblock.dungeon.ThreeWeirdos; import me.xmrvizzy.skyblocker.skyblock.dungeon.Trivia; @@ -32,6 +33,7 @@ public interface ChatMessageListener { new ThreeWeirdos(), new Trivia(), new TreasureHunter(), + new HungryHiker(), // Filters new AbilityFilter(), new AdFilter(), diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 7559902a..3d507301 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -286,6 +286,7 @@ public class SkyblockerConfig implements ConfigData { public static class Barn { public boolean solveTreasureHunter = true; + public boolean solveHungryHiker = true; } public static class Messages { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java new file mode 100644 index 00000000..0ff487bf --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java @@ -0,0 +1,47 @@ +package me.xmrvizzy.skyblocker.skyblock.barn; + +import me.xmrvizzy.skyblocker.chat.ChatFilterResult; +import me.xmrvizzy.skyblocker.chat.ChatPatternListener; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; + +public class HungryHiker extends ChatPatternListener { + + private static final Map foods; + + public HungryHiker() { super("^§e\\[NPC] Hungry Hiker§f: (The food I want is|(I asked for) food that is) ([a-zA-Z, '\\-]*\\.)$"); } + + @Override + public ChatFilterResult state() { + return SkyblockerConfig.get().locations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + } + + @Override + public boolean onMatch(Text message, Matcher matcher) { + MinecraftClient client = MinecraftClient.getInstance(); + if (client.player == null) return false; + String foodDescription = matcher.group(3); + String food = foods.get(foodDescription); + if (food == null) return false; + String middlePartOfTheMessageToSend = matcher.group(2) != null ? matcher.group(2) : matcher.group(1); + client.player.sendMessage(Text.of("§e[NPC] Hungry Hiker§f: " + middlePartOfTheMessageToSend + " " + food), false); + return true; + } + + static { + foods = new HashMap<>(); + foods.put("from a cow.", Text.translatable("item.minecraft.cooked_beef").getString()); + foods.put("from a fowl.", Text.translatable("item.minecraft.cooked_chicken").getString()); + foods.put("red on the inside, green on the outside.", Text.translatable("item.minecraft.melon_slice").getString()); + foods.put("a cooked potato.", Text.translatable("item.minecraft.baked_potato").getString()); + foods.put("a stew.", Text.translatable("item.minecraft.rabbit_stew").getString()); + foods.put("a grilled meat.", Text.translatable("item.minecraft.cooked_porkchop").getString()); + foods.put("red and crunchy.", Text.translatable("item.minecraft.apple").getString()); + foods.put("made of wheat.", Text.translatable("item.minecraft.bread").getString()); + } +} -- cgit From 8abac9f8babb5ffa1c2c0d38bd54cc0788ae1b87 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sun, 9 Apr 2023 01:47:23 +0200 Subject: Change order Sort Additions alphabetically for easier findability --- .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 3d507301..80a8cc64 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -239,6 +239,10 @@ public class SkyblockerConfig implements ConfigData { } public static class Locations { + @ConfigEntry.Category("barn") + @ConfigEntry.Gui.CollapsibleObject() + public Barn barn = new Barn(); + @ConfigEntry.Category("dungeons") @ConfigEntry.Gui.CollapsibleObject() public Dungeons dungeons = new Dungeons(); @@ -246,10 +250,6 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("dwarvenmines") @ConfigEntry.Gui.CollapsibleObject() public DwarvenMines dwarvenMines = new DwarvenMines(); - - @ConfigEntry.Category("barn") - @ConfigEntry.Gui.CollapsibleObject() - public Barn barn = new Barn(); } public static class Dungeons { @@ -285,8 +285,8 @@ public class SkyblockerConfig implements ConfigData { } public static class Barn { - public boolean solveTreasureHunter = true; public boolean solveHungryHiker = true; + public boolean solveTreasureHunter = true; } public static class Messages { @@ -325,4 +325,4 @@ public class SkyblockerConfig implements ConfigData { public static SkyblockerConfig get() { return AutoConfig.getConfigHolder(SkyblockerConfig.class).getConfig(); } -} \ No newline at end of file +} -- cgit From d3ceb45bb6e27be2f8ab6d30dfa6944aad65c2ea Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Mon, 10 Apr 2023 12:52:08 +0200 Subject: Update TreasureHunter.java --- .../java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index e7c8ff36..41b42bad 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -40,7 +40,7 @@ public class TreasureHunter extends ChatPatternListener { locations.put("There's a small house in the gorge, I saw some treasure near there.", "297 87 -562"); locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut.", "392 85 -372"); locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out.", "305 73 -557"); - locations.put("There are some small ruins out in the desert, might want to check it out.", "320 102 -471"); + locations.put("There are some small ruins out in the desert, might want to check them out.", "320 102 -471"); locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there.", "234 56 -410"); locations.put("There are some old stone structures in the Mushroom Gorge, give them a look.", "223 54 -503"); locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for.", "205 42 -527"); @@ -58,4 +58,4 @@ public class TreasureHunter extends ChatPatternListener { locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge.", "142 69 -448"); locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones.", "188 77 -459"); } -} \ No newline at end of file +} -- cgit From 00c7bd2c0fb2243d1e9a4dd52fde124890ab990f Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Thu, 13 Apr 2023 21:03:27 +0200 Subject: change regex this msg can't be picked up otherwise : Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there. --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index 41b42bad..c32847eb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -14,7 +14,7 @@ public class TreasureHunter extends ChatPatternListener { private static final Map locations; - public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-]*\\.)$"); } + public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-\\.]*)$"); } @Override public ChatFilterResult state() { -- cgit From 75c3b99d14176998789ea0152a02f91c67400d73 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Sat, 15 Apr 2023 17:35:18 +0200 Subject: change coord slightly change coord cause better --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index c32847eb..895354c2 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -34,7 +34,7 @@ public class TreasureHunter extends ChatPatternListener { static { locations = new HashMap<>(); - locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "256 70 -490"); + locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "258 70 -492"); locations.put("I was in the desert earlier, and I saw something near a red sand rock.", "357 82 -319"); locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house.", "259 184 -564"); locations.put("There's a small house in the gorge, I saw some treasure near there.", "297 87 -562"); -- cgit From 978359c800d5b98b28e6c987a43074bcfc10a4cf Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Mon, 17 Apr 2023 18:37:34 +0200 Subject: fix Official wiki being wrong again no FR i'm gonna get angry at some point, there are so many errors in it... --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java index 0ff487bf..e1ee7756 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java @@ -36,7 +36,7 @@ public class HungryHiker extends ChatPatternListener { static { foods = new HashMap<>(); foods.put("from a cow.", Text.translatable("item.minecraft.cooked_beef").getString()); - foods.put("from a fowl.", Text.translatable("item.minecraft.cooked_chicken").getString()); + foods.put("meat from a fowl.", Text.translatable("item.minecraft.cooked_chicken").getString()); foods.put("red on the inside, green on the outside.", Text.translatable("item.minecraft.melon_slice").getString()); foods.put("a cooked potato.", Text.translatable("item.minecraft.baked_potato").getString()); foods.put("a stew.", Text.translatable("item.minecraft.rabbit_stew").getString()); -- cgit From fb2e183e0bbcd9f519b740235cf90182cc33e84b Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Wed, 19 Apr 2023 23:44:20 +0200 Subject: fix missing dots at end of sentences --- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java index e1ee7756..b0f0445a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java @@ -29,7 +29,7 @@ public class HungryHiker extends ChatPatternListener { String food = foods.get(foodDescription); if (food == null) return false; String middlePartOfTheMessageToSend = matcher.group(2) != null ? matcher.group(2) : matcher.group(1); - client.player.sendMessage(Text.of("§e[NPC] Hungry Hiker§f: " + middlePartOfTheMessageToSend + " " + food), false); + client.player.sendMessage(Text.of("§e[NPC] Hungry Hiker§f: " + middlePartOfTheMessageToSend + " " + food + "."), false); return true; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index 895354c2..ad5db522 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -28,7 +28,7 @@ public class TreasureHunter extends ChatPatternListener { String hint = matcher.group(1); String location = locations.get(hint); if (location == null) return false; - client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location), false); + client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location + "."), false); return true; } -- cgit From eb2b13955df69c783dee2db15e82d17be8f9246f Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 26 Apr 2023 15:34:45 +0200 Subject: Added file to correct directory ja_JP.json -> src/main/resources/assets/skyblocker/lang/ja_JP.json --- ja_JP.json | 74 ---------------------- .../resources/assets/skyblocker/lang/ja_JP.json | 74 ++++++++++++++++++++++ 2 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 ja_JP.json create mode 100644 src/main/resources/assets/skyblocker/lang/ja_JP.json (limited to 'src') diff --git a/ja_JP.json b/ja_JP.json deleted file mode 100644 index 954647c7..00000000 --- a/ja_JP.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "key.categories.skyblocker": "Skyblocker", - "key.hotbarSlotLock": "ホットバースロットのロック", - "key.wikiLookup": "Wikiのページを開く", - "text.autoconfig.skyblocker.title": "Skyblockerの設定", - "text.autoconfig.skyblocker.category.general": "一般", - "text.autoconfig.skyblocker.option.general.bars": "体力,マナ,ディフェンス,経験値のバー", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "バーを有効にする", - "text.autoconfig.skyblocker.option.general.bars.barpositions": "バーの位置を変える", - "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "体力バーの位置", - "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "マナバーの位置", - "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "ディフェンスバーの位置", - "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "経験値バーの位置", - "text.autoconfig.skyblocker.option.general.quicknav": "クイックナビ", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "クイックナビを有効にする", - "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Shiftキーを押さずにバックパックのプレビューを見る", - "text.autoconfig.skyblocker.option.general.itemTooltip": "アイテムの詳細情報", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "NPC売りの値段を表示する", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "binオークションの平均の値段を表示する", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "平均の取り方", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "何日間の平均の値段を表示するか選べます", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "最安価の表示を表示する", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "バザーでの売り買いの値段を表示する", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "ミュージアムに寄付したか、またその日を表示する", - "text.autoconfig.skyblocker.option.general.hitbox": "ヒットボックス", - "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "バージョン1.8での作物のヒットボックスを使う", - "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "バージョン1.8でのレバーのヒットボックスを使う", - "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b]§cツールチップ上のアイテムの値段は最大60秒ごとに更新されます。されていない場合はlatest.logを確認してください", - "text.autoconfig.skyblocker.category.richPresence": "discordに自分のゲームアクティビティを表示する", - "text.autoconfig.skyblocker.option.richPresence.info": "skyblockの情報", - "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "この値はあなたがサイクリングしている場合は重要ではありません", - "text.autoconfig.skyblocker.option.richPresence.cycleMode": "円状のskyblockの情報", - "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "有効", - "text.autoconfig.skyblocker.option.richPresence.customMessage": "カスタムメッセージ", - "text.autoconfig.skyblocker.option.general.itemList": "アイテムリスト", - "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "アイテムリストを有効にする", - "text.autoconfig.skyblocker.category.locations": "場所", - "text.autoconfig.skyblocker.option.locations.dungeons": "ダンジョン", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "ダンジョンのマップ表示を有効にする", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "嘘つきを当てるパズルのソルバー", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "ブレイズパズルのソルバー", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "クイズのソルバー", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "F7のターミナルソルバー", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "select Coloredのソルバー", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Click in Orderのソルバー", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Starts Withのソルバー", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "ドワーフマイン", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "ドリルの燃料表示を有効にする", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Fetchurの要求アイテムの表示", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Puzzler Puzzleのソルバー", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "ドワーフマインでのHUD", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "有効", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "バックグラウンド表示を有効にする", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", - "text.autoconfig.skyblocker.category.messages": "メッセージ", - "text.autoconfig.skyblocker.option.messages.hideAbility": "アビリティのクールダウンを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideHeal": "回復メッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTEのメッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionのメッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Molten Waveのメッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideAds": "全体チャットの宣伝を非表示にする", - "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "テレポートパッドのメッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideCombo": "Comboのメッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopetのメッセージを非表示にする", - "text.autoconfig.skyblocker.option.messages.hideMana": "マナの使用表示をアクションバーから非表示にする", - "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBarでより良くできます", - "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2新しいバージョンがあります!", - "skyblocker.update.update_link": " §2§nここをクリック§r", - "skyblocker.update.update_message_end": " §a最新の機能を体験しましょう.", - "skyblocker.update.hover_text": "Modrinthを開く", - "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "アップデート通知", - "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2あなたのAPI keyを設定しました!" -} diff --git a/src/main/resources/assets/skyblocker/lang/ja_JP.json b/src/main/resources/assets/skyblocker/lang/ja_JP.json new file mode 100644 index 00000000..954647c7 --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/ja_JP.json @@ -0,0 +1,74 @@ +{ + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "ホットバースロットのロック", + "key.wikiLookup": "Wikiのページを開く", + "text.autoconfig.skyblocker.title": "Skyblockerの設定", + "text.autoconfig.skyblocker.category.general": "一般", + "text.autoconfig.skyblocker.option.general.bars": "体力,マナ,ディフェンス,経験値のバー", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "バーを有効にする", + "text.autoconfig.skyblocker.option.general.bars.barpositions": "バーの位置を変える", + "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "体力バーの位置", + "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "マナバーの位置", + "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "ディフェンスバーの位置", + "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "経験値バーの位置", + "text.autoconfig.skyblocker.option.general.quicknav": "クイックナビ", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "クイックナビを有効にする", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Shiftキーを押さずにバックパックのプレビューを見る", + "text.autoconfig.skyblocker.option.general.itemTooltip": "アイテムの詳細情報", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "NPC売りの値段を表示する", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "binオークションの平均の値段を表示する", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "平均の取り方", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "何日間の平均の値段を表示するか選べます", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "最安価の表示を表示する", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "バザーでの売り買いの値段を表示する", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "ミュージアムに寄付したか、またその日を表示する", + "text.autoconfig.skyblocker.option.general.hitbox": "ヒットボックス", + "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "バージョン1.8での作物のヒットボックスを使う", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "バージョン1.8でのレバーのヒットボックスを使う", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b]§cツールチップ上のアイテムの値段は最大60秒ごとに更新されます。されていない場合はlatest.logを確認してください", + "text.autoconfig.skyblocker.category.richPresence": "discordに自分のゲームアクティビティを表示する", + "text.autoconfig.skyblocker.option.richPresence.info": "skyblockの情報", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "この値はあなたがサイクリングしている場合は重要ではありません", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "円状のskyblockの情報", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "有効", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "カスタムメッセージ", + "text.autoconfig.skyblocker.option.general.itemList": "アイテムリスト", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "アイテムリストを有効にする", + "text.autoconfig.skyblocker.category.locations": "場所", + "text.autoconfig.skyblocker.option.locations.dungeons": "ダンジョン", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "ダンジョンのマップ表示を有効にする", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "嘘つきを当てるパズルのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "ブレイズパズルのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "クイズのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "F7のターミナルソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "select Coloredのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Click in Orderのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Starts Withのソルバー", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "ドワーフマイン", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "ドリルの燃料表示を有効にする", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Fetchurの要求アイテムの表示", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Puzzler Puzzleのソルバー", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "ドワーフマインでのHUD", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "有効", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "バックグラウンド表示を有効にする", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", + "text.autoconfig.skyblocker.category.messages": "メッセージ", + "text.autoconfig.skyblocker.option.messages.hideAbility": "アビリティのクールダウンを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideHeal": "回復メッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTEのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Molten Waveのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideAds": "全体チャットの宣伝を非表示にする", + "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "テレポートパッドのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideCombo": "Comboのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopetのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideMana": "マナの使用表示をアクションバーから非表示にする", + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBarでより良くできます", + "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2新しいバージョンがあります!", + "skyblocker.update.update_link": " §2§nここをクリック§r", + "skyblocker.update.update_message_end": " §a最新の機能を体験しましょう.", + "skyblocker.update.hover_text": "Modrinthを開く", + "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "アップデート通知", + "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2あなたのAPI keyを設定しました!" +} -- cgit From 65edef61a52fc728032d10941e84bba57cb2a021 Mon Sep 17 00:00:00 2001 From: Yasin Date: Mon, 1 May 2023 01:21:12 +0200 Subject: add new en_us translations --- .../resources/assets/skyblocker/lang/en_us.json | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index ddfcdfee..210c6969 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -50,17 +50,101 @@ "text.autoconfig.skyblocker.category.quickNav" : "Quick Navigation", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav" : "Enable Quick Navigation", "text.autoconfig.skyblocker.option.quickNav.button1" : "Button 1", + "text.autoconfig.skyblocker.option.quickNav.button1.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button1.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button1.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button2" : "Button 2", + "text.autoconfig.skyblocker.option.quickNav.button2.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button2.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button2.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button3" : "Button 3", + "text.autoconfig.skyblocker.option.quickNav.button3.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button3.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button3.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button4" : "Button 4", + "text.autoconfig.skyblocker.option.quickNav.button4.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button4.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button4.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button5" : "Button 5", + "text.autoconfig.skyblocker.option.quickNav.button5.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button5.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button5.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button6" : "Button 6", + "text.autoconfig.skyblocker.option.quickNav.button6.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button6.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button6.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button7" : "Button 7", + "text.autoconfig.skyblocker.option.quickNav.button7.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button7.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button7.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button8" : "Button 8", + "text.autoconfig.skyblocker.option.quickNav.button8.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button8.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button8.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button9" : "Button 9", + "text.autoconfig.skyblocker.option.quickNav.button9.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button9.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button9.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button10" : "Button 10", + "text.autoconfig.skyblocker.option.quickNav.button10.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button10.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button10.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button11" : "Button 11", + "text.autoconfig.skyblocker.option.quickNav.button11.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button11.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button11.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button12" : "Button 12", + "text.autoconfig.skyblocker.option.quickNav.button12.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button12.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button12.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.general.itemList": "Item List", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Enable Item List", -- cgit From 9ce4ac06e480ba4f2dfeeef334aead5487b1ecd7 Mon Sep 17 00:00:00 2001 From: Yasin Date: Mon, 1 May 2023 01:21:48 +0200 Subject: add new contributor to readme and mod desc. --- FEATURES.md | 15 ++++++----- README.md | 54 ++++++++++++++++++++++++-------------- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 44 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/FEATURES.md b/FEATURES.md index c2f2a287..1cd95a1e 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -2,9 +2,10 @@ * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages * Dungeon Minimap * Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * F7 Terminal: Order, Color, Name + * Three Weirdos + * Blaze + * Croesus + * F7 Terminal: Order, Color, Name * Dwarven Mines Solver: Fetchur, Puzzler * Drill Fuel in Item Durability Bar * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) @@ -12,9 +13,11 @@ * reparty: write /rp to reparty * Wiki Lookup: press f4 to open the wiki page about the held item * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message -* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, warp hub -* Recipe book: in the vanilla recipe book all skyblock items are listed and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and hold shift to preview +* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, + warp hub +* Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item +* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and + hold shift to preview * Update notification * Commission HUD: Dwarven Mines quests * 1.8 hitbox for lever and farmland \ No newline at end of file diff --git a/README.md b/README.md index b1137f37..59e8a7fa 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ - +skyblocker ## Skyblocker + [![modrinth statistic](https://img.shields.io/modrinth/dt/skyblocker-liap?color=00AF5C&label=Download&labelColor=cecece00AF5C&logo=modrinth)](https://modrinth.com/mod/skyblocker-liap) -[![github statistic](https://img.shields.io/github/downloads/SkyblockerMod/skyblocker/total?labelColor=cecece&color=000000&label=Download&logo=github&logoColor=black)](https://github.com/SkyblockerMod/Skyblocker/releases/latest) -[![Build Beta](https://img.shields.io/github/actions/workflow/status/SkyblockerMod/Skyblocker/beta.yml?labelColor=cecece&label=beta&logo=github&logoColor=black)](https://github.com/SkyblockerMod/Skyblocker/actions/workflows/beta.yml) +[![github statistic](https://img.shields.io/github/downloads/SkyblockerMod/skyblocker/total?labelColor=cecece&color=000000&label=Download&logo=github&logoColor=black)](https://github.com/SkyblockerMod/Skyblocker/releases/latest) +[![Build Beta](https://img.shields.io/github/actions/workflow/status/SkyblockerMod/Skyblocker/beta.yml?labelColor=cecece&label=beta&logo=github&logoColor=black)](https://github.com/SkyblockerMod/Skyblocker/actions/workflows/beta.yml) [![Discord](https://img.shields.io/discord/879732108745125969?logo=discord&labelColor=cecece&color=7289DA&label=)](https://discord.com/invite/aNNJHQykck) [![modrinth statistic](https://img.shields.io/badge/buy%20me%20coffee-skyblocker?color=434B57&logo=kofi)](https://ko-fi.com/wohlhabend) - Hypixel Skyblock Mod for Minecraft 1.17.x + 1.18.x + 1.19.x Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation) ## Features +
open @@ -20,9 +21,10 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages * Dungeon Minimap * Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * F7 Terminal: Order, Color, Name + * Three Weirdos + * Blaze + * Croesus + * F7 Terminal: Order, Color, Name * Dwarven Mines Solver: Fetchur, Puzzler * Drill Fuel in Item Durability Bar * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) @@ -30,9 +32,11 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in * reparty: write /rp to reparty * Wiki Lookup: press f4 to open the wiki page about the held item * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message -* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, warp hub +* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, + warp hub * Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and hold shift to preview +* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and + hold shift to preview * Update notification * Commission HUD: Dwarven Mines quests * 1.8 hitbox for lever and farmland @@ -40,7 +44,9 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
___ + ## Images +
open @@ -57,7 +63,8 @@ ___ ## Contribute -Everyone can contribute to Skyblocker, read [this](https://github.com/SkyblockerMod/Skyblocker/wiki/Contribute) for more information. +Everyone can contribute to Skyblocker, read [this](https://github.com/SkyblockerMod/Skyblocker/wiki/Contribute) for more +information. ## Stargazers @@ -65,20 +72,27 @@ Everyone can contribute to Skyblocker, read [this](https://github.com/Skyblocker ## Credits -| [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | -|:-------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:| -| [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | +| [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | +|:-----------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:| +| [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | + +| [Zailer43](https://github.com/Zailer43) | [TacoMonkey11](https://github.com/TacoMonkey11) | [KonaeAkira](https://github.com/KonaeAkira) | [Fix3dll](https://github.com/Fix3dll) | +|:-----------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------:| +| [Zailer43](https://github.com/Zailer43) | [TacoMonkey11](https://github.com/TacoMonkey11) | [KonaeAkira](https://github.com/KonaeAkira) | [Fix3dll](https://github.com/Fix3dll) | -| [Zailer43](https://github.com/Zailer43) | [TacoMonkey11](https://github.com/TacoMonkey11) | [KonaeAkira](https://github.com/KonaeAkira) | [Fix3dll](https://github.com/Fix3dll) | -|:-----------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------:| -| [Zailer43](https://github.com/Zailer43) | [TacoMonkey11](https://github.com/TacoMonkey11) | [KonaeAkira](https://github.com/KonaeAkira) | [Fix3dll](https://github.com/Fix3dll) | +| [ADON15c](https://github.com/ADON15c) | [TheColdPot](https://github.com/TheColdPot) | [Julienraptor01](https://github.com/Julienraptor01) | [MiraculixxT](https://github.com/MiraculixxT) | +|:--------------------------------------------------------------------------------------------------:|-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------| +| [ADON15c](https://github.com/ADON15c) | [TheColdPot](https://github.com/TheColdPot) | [Julienraptor01](https://github.com/Julienraptor01) | [ADON15c](https://github.com/MiraculixxT) | +| [catandA](https://github.com/catandA) | [kevinthegreat1](https://github.com/kevinthegreat1) | [AzureAaron](https://github.com/AzureAaron) | +|:--------------------------------------------------------------------------------------------------:|-------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------| +| [catandA](https://github.com/catandA) | [kevinthegreat1](https://github.com/kevinthegreat1) | [AzureAaron](https://github.com/AzureAaron) | -| [Zailer43](https://github.com/ADON15c) | -|:---------------------------------------------------------------------------------------------------:| -| [ADON15c](https://github.com/ADON15c) | ### Translators + German ([LifeIsAParadox](https://github.com/LifeIsAParadox)) \ Indonesian ([null2264](https://github.com/null2264)) \ Russian ([HyperSoop](https://github.com/HyperSoop)) \ -French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01)) +French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01)) \ +Japanese ([hirochisan](https://github.com/@irochisan)) \ +Chinese ([catandA](https://github.com/catandA)) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index dd94270d..d8ef4941 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Skyblocker", "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], - "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh"], + "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/SkyblockerMod/Skyblocker", -- cgit From d5b035748d02c0847f4b7d9afc74b8a58d107ac1 Mon Sep 17 00:00:00 2001 From: Yasin Piri Date: Wed, 26 Apr 2023 13:38:57 +0000 Subject: Translated using Weblate (German) Currently translated at 27.4% (28 of 102 strings) Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/de/ --- .../resources/assets/skyblocker/lang/de_de.json | 61 ++++++++++------------ 1 file changed, 29 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index a74b39ff..4c6acbf0 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -1,33 +1,30 @@ { - "key.categories.skyblocker": "Skyblocker", - "key.hotbarSlotLock": "Schlitzsperre (Hotbar)", - - "text.autoconfig.skyblocker.title": "Skyblocker-Einstellungen", - - "text.autoconfig.skyblocker.category.general": "Allgemein", - "text.autoconfig.skyblocker.option.general.bars": "Gesundheits-, Mana-, Verteidigungs- und XP-Balken", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren", - - "text.autoconfig.skyblocker.category.locations": "Standorte", - "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Drei Verrückte Rätsel lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Blaze Rätsel lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Rätsel lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Löser", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Wähle die richtige Farbe", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Klick in der Reihenfolge lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Beginnt mit lösen", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Zwergenminen", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Bohrtreibstoff aktivieren", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Löse Fetchur", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Puzzler-Rätsel lösen", - - "text.autoconfig.skyblocker.category.messages": "Nachrichten", - "text.autoconfig.skyblocker.option.messages.hideAbility": "Abklingzeit der Fähigkeit nachricht verbergen", - "text.autoconfig.skyblocker.option.messages.hideHeal": "Heilungsnachrichten verbergen", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTE-Meldungen ausblenden", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionsmeldung ausblenden", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden", - "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden" -} \ No newline at end of file + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Schlitzsperre (Hotbar)", + "text.autoconfig.skyblocker.title": "Skyblocker-Einstellungen", + "text.autoconfig.skyblocker.category.general": "Allgemein", + "text.autoconfig.skyblocker.option.general.bars": "Gesundheits-, Mana-, Verteidigungs- und XP-Balken", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren", + "text.autoconfig.skyblocker.category.locations": "Standorte", + "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Drei Verrückte Rätsel lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Blaze Rätsel lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Rätsel lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Löser", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Wähle die richtige Farbe", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Klick in der Reihenfolge lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Beginnt mit lösen", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Zwergenminen", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Bohrtreibstoff aktivieren", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Löse Fetchur", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Puzzler-Rätsel lösen", + "text.autoconfig.skyblocker.category.messages": "Nachrichten", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Abklingzeit der Fähigkeit nachricht verbergen", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Heilungsnachrichten verbergen", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTE-Meldungen ausblenden", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionsmeldung ausblenden", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden", + "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden", + "key.wikiLookup": "Wiki-Abfrage" +} -- cgit From 51385486b570049d5e9d3c31e661d2f15b183728 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Thu, 27 Apr 2023 12:59:42 +0000 Subject: Translated using Weblate (German) by LifeIsAParadox Currently translated at 28.4% (29 of 102 strings) Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/de/ --- src/main/resources/assets/skyblocker/lang/de_de.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index 4c6acbf0..e56f2713 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -26,5 +26,6 @@ "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionsmeldung ausblenden", "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden", "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden", - "key.wikiLookup": "Wiki-Abfrage" + "key.wikiLookup": "Wiki-Abfrage", + "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Rechts" } -- cgit From c4d827d7adae419dc0d484a62e92449ade8c9c2b Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Thu, 27 Apr 2023 13:12:27 +0000 Subject: Translated using Weblate (German) Currently translated at 30.3% (31 of 102 strings) Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/de/ --- src/main/resources/assets/skyblocker/lang/de_de.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index e56f2713..090cd4d3 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -27,5 +27,7 @@ "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden", "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden", "key.wikiLookup": "Wiki-Abfrage", - "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Rechts" + "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Rechts", + "text.autoconfig.skyblocker.option.general.quicknav": "Schnellnavigation", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Schnellnavigation Einschalten" } -- cgit