From c9c7bce2fa710b94db8bec7a2979d244ed41625c Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Wed, 11 Jan 2023 18:21:59 +0100 Subject: Update mappings --- .../me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java index a589b759..9d0bbfe9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java @@ -6,9 +6,9 @@ import me.xmrvizzy.skyblocker.container.ContainerSolver; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.registry.Registry; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -- cgit From 71f54129ed3c257f9bc7cf4f9817ccae22691be2 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Fri, 20 Jan 2023 21:47:23 +0100 Subject: Just commits change i forgot to commit some todos will follow --- gradle.properties | 7 +++++ .../skyblocker/skyblock/dungeon/Reparty.java | 6 +++-- .../skyblock/itemlist/ResultButtonWidget.java | 9 ++++--- .../skyblock/quicknav/QuickNavButton.java | 30 ++++++++++++++-------- .../me/xmrvizzy/skyblocker/utils/RenderUtils.java | 2 +- 5 files changed, 38 insertions(+), 16 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon') diff --git a/gradle.properties b/gradle.properties index f5a45f2f..f1ea4278 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,19 @@ org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US # Fabric Properties (https://fabricmc.net/versions.html) +## 1.19.3 minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 +## 1.19.2 +#minecraft_version=1.19.2 +#yarn_mappings=1.19.2+build.28 loader_version=0.14.12 #Fabric api +## 1.19.3 fabric_version=0.72.0+1.19.3 +## 1.19.2 +#fabric_version=0.72.0+1.19.2 # Dependencies ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files) diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java index c06822de..8bfa9c0a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java @@ -30,7 +30,8 @@ public class Reparty extends ChatPatternListener { dispatcher.register(ClientCommandManager.literal("rp").executes(context -> { if (!Utils.isOnSkyblock || this.repartying || client.player == null) return 0; this.repartying = true; - client.player.sendChatMessage("/p list", Text.of("/p list")); + //client.player.sendChatMessage("/p list", Text.of("/p list")); + client.player.sendMessage(Text.of("/p list")); return 0; })); }); @@ -77,6 +78,7 @@ public class Reparty extends ChatPatternListener { } private void sendCommand(ClientPlayerEntity player, String command, int delay) { - skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY); + // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY); + skyblocker.scheduler.schedule(() -> player.sendMessage(Text.of(command)), delay * BASE_DELAY); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 6067ff48..552d3def 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -38,9 +38,12 @@ public class ResultButtonWidget extends ClickableWidget { MinecraftClient client = MinecraftClient.getInstance(); RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderTexture(0, BACKGROUND_TEXTURE); - this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); - client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4); - client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4); + // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); + this.drawTexture(matrices, this.getX(), this.getY(), 29, 206, this.getWidth(), this.getHeight()); + // client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4); + client.getItemRenderer().renderInGui(this.itemStack, this.getX() + 4, this.getY() + 4); + // client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4); + client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4); } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index ac381240..985cbd22 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -49,8 +49,10 @@ public class QuickNavButton extends ClickableWidget { int w = ((HandledScreenAccessor)handledScreen).getBackgroundWidth(); int h = ((HandledScreenAccessor)handledScreen).getBackgroundHeight(); if (h > 166) --h; // why is this even a thing - this.x = x + this.index % 6 * 28 + 4; - this.y = this.index < 6 ? y - 28 : y + h - 4; + // this.x = x + this.index % 6 * 28 + 4; + this.setX(x + this.index % 6 * 28 + 4); + // this.y = this.index < 6 ? y - 28 : y + h - 4; + this.setY(this.index < 6 ? y - 28 : y + h - 4); this.u = 28; this.v = (index < 6 ? 0 : 64) + (toggled ? 32 : 0); } @@ -60,7 +62,8 @@ public class QuickNavButton extends ClickableWidget { public void onClick(double mouseX, double mouseY) { if (!this.toggled) { this.toggled = true; - CLIENT.player.sendChatMessage(command, Text.of(command)); + // CLIENT.player.sendChatMessage(command, Text.of(command)); + CLIENT.player.sendMessage(Text.of(command)); } } @@ -72,21 +75,28 @@ public class QuickNavButton extends ClickableWidget { // render button background if (!this.toggled) { if (this.index >= 6) - this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4); + // this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4); + this.drawTexture(matrices, this.getX(), this.getY() + 4, this.u, this.v + 4, this.width, this.height - 4); else - this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4); - } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height); + // this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4); + this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height - 4); + // } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height); + } else this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height); // render button icon if (!this.toggled) { if (this.index >= 6) - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6); else - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9); } else { if (this.index >= 6) - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9); else - CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6); } RenderSystem.enableDepthTest(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java index c659f4f9..0f2f3aef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -//import net.minecraft.util.math.Vec3f; +// import net.minecraft.util.math.Vec3f; import net.minecraft.util.math.RotationAxis; public class RenderUtils { -- cgit From ce27cbf8a193bda4bef348de017255d9a20f9274 Mon Sep 17 00:00:00 2001 From: Julienraptor01 Date: Fri, 20 Jan 2023 22:04:54 +0100 Subject: fix the registry thingy and add todos --- .../skyblocker/skyblock/dungeon/terminal/ColorTerminal.java | 6 ++++-- .../xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java | 11 ++++++++--- .../skyblocker/skyblock/itemlist/ResultButtonWidget.java | 1 + .../xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java index 9d0bbfe9..f5c97738 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java @@ -6,7 +6,8 @@ import me.xmrvizzy.skyblocker.container.ContainerSolver; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.registry.Registry; +// import net.minecraft.registry.Registry; +import net.minecraft.registry.Registries; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import org.slf4j.Logger; @@ -62,7 +63,8 @@ public class ColorTerminal extends ContainerSolver { itemColor = new HashMap<>(); for (DyeColor color : DyeColor.values()) for (String item : new String[]{"dye", "wool", "stained_glass", "terracotta"}) - itemColor.put(Registry.ITEM.get(new Identifier(color.getName() + '_' + item)), color); + // itemColor.put(Registry.ITEM.get(new Identifier(color.getName() + '_' + item)), color); + itemColor.put(Registries.ITEM.get(new Identifier(color.getName() + '_' + item)), color); itemColor.put(Items.BONE_MEAL, DyeColor.WHITE); itemColor.put(Items.LAPIS_LAZULI, DyeColor.BLUE); itemColor.put(Items.COCOA_BEANS, DyeColor.BROWN); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java index ab378e1e..249fba9f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemFixerUpper.java @@ -1,6 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.itemlist; import net.minecraft.item.Items; +// import net.minecraft.registry.Registry; +import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import java.util.Map; @@ -222,11 +224,14 @@ public class ItemFixerUpper { if (id.equals("minecraft:prismarine")) return PRISMARINE_VARIANTS[damage]; id = MAPPING.getOrDefault(id, id); - if (Registry.ITEM.get(new Identifier(id)).equals(Items.AIR)) { + // if (Registry.ITEM.get(new Identifier(id)).equals(Items.AIR)) { + if (Registries.ITEM.get(new Identifier(id)).equals(Items.AIR)) { String shortId = id.split(":")[1]; - if (damage < BLOCK_COLORS.length && !Registry.ITEM.get(new Identifier("minecraft:" + BLOCK_COLORS[damage] + shortId)).equals(Items.AIR)) + // if (damage < BLOCK_COLORS.length && !Registry.ITEM.get(new Identifier("minecraft:" + BLOCK_COLORS[damage] + shortId)).equals(Items.AIR)) + if (damage < BLOCK_COLORS.length && !Registries.ITEM.get(new Identifier("minecraft:" + BLOCK_COLORS[damage] + shortId)).equals(Items.AIR)) return "minecraft:" + BLOCK_COLORS[damage] + shortId; - if (damage < TREE_VARIANTS.length && !Registry.ITEM.get(new Identifier("minecraft:" + TREE_VARIANTS[damage] + shortId)).equals(Items.AIR)) + // if (damage < TREE_VARIANTS.length && !Registry.ITEM.get(new Identifier("minecraft:" + TREE_VARIANTS[damage] + shortId)).equals(Items.AIR)) + if (damage < TREE_VARIANTS.length && !Registries.ITEM.get(new Identifier("minecraft:" + TREE_VARIANTS[damage] + shortId)).equals(Items.AIR)) return "minecraft:" + TREE_VARIANTS[damage] + shortId; if (id.contains("wooden_")) return id.replaceFirst("wooden_", TREE_VARIANTS[damage]); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 552d3def..6760c919 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -50,6 +50,7 @@ public class ResultButtonWidget extends ClickableWidget { public void renderTooltip(MatrixStack matrices, int mouseX, int mouseY) { MinecraftClient client = MinecraftClient.getInstance(); List tooltip = client.currentScreen.getTooltipFromItem(this.itemStack); + // TODO : add null check with log error client.currentScreen.renderTooltip(matrices, tooltip, mouseX, mouseY); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index 985cbd22..d977a400 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -64,6 +64,7 @@ public class QuickNavButton extends ClickableWidget { this.toggled = true; // CLIENT.player.sendChatMessage(command, Text.of(command)); CLIENT.player.sendMessage(Text.of(command)); + // TODO : add null check with log error } } -- cgit From d27e15f8f346e9859edf5d034d258462e5a4871c Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:40:07 -0400 Subject: Properly send commands over the network --- .../skyblocker/skyblock/dungeon/Reparty.java | 17 ++++++++--------- .../skyblocker/skyblock/quicknav/QuickNav.java | 20 ++++++++++---------- .../skyblocker/skyblock/quicknav/QuickNavButton.java | 3 +-- 3 files changed, 19 insertions(+), 21 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java index 8bfa9c0a..19f13c32 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java @@ -1,18 +1,18 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.chat.ChatPatternListener; import me.xmrvizzy.skyblocker.utils.Utils; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.text.Text; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class Reparty extends ChatPatternListener { private static final MinecraftClient client = MinecraftClient.getInstance(); private static final SkyblockerMod skyblocker = SkyblockerMod.getInstance(); @@ -30,8 +30,7 @@ public class Reparty extends ChatPatternListener { dispatcher.register(ClientCommandManager.literal("rp").executes(context -> { if (!Utils.isOnSkyblock || this.repartying || client.player == null) return 0; this.repartying = true; - //client.player.sendChatMessage("/p list", Text.of("/p list")); - client.player.sendMessage(Text.of("/p list")); + client.player.networkHandler.sendCommand("p list"); return 0; })); }); @@ -69,9 +68,9 @@ public class Reparty extends ChatPatternListener { this.repartying = false; return; } - sendCommand(playerEntity, "/p disband", 1); + sendCommand(playerEntity, "p disband", 1); for (int i = 0; i < this.players.length; ++i) { - String command = "/p invite " + this.players[i]; + String command = "p invite " + this.players[i]; sendCommand(playerEntity, command, i + 2); } skyblocker.scheduler.schedule(() -> this.repartying = false, this.players.length + 2); @@ -79,6 +78,6 @@ public class Reparty extends ChatPatternListener { private void sendCommand(ClientPlayerEntity player, String command, int delay) { // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY); - skyblocker.scheduler.schedule(() -> player.sendMessage(Text.of(command)), delay * BASE_DELAY); + skyblocker.scheduler.schedule(() -> player.networkHandler.sendCommand(command), delay * BASE_DELAY); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java index bcc57a00..9c1ed300 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java @@ -14,19 +14,19 @@ public class QuickNav { public static List init(String screenTitle) { List buttons = new ArrayList<>(); try { - buttons.add(new QuickNavButton(0, screenTitle.contains("Your Skills"), "/skills", new ItemStack(Items.DIAMOND_SWORD))); - buttons.add(new QuickNavButton(1, screenTitle.contains("Collection"), "/collection", new ItemStack(Items.PAINTING))); + buttons.add(new QuickNavButton(0, screenTitle.contains("Your Skills"), "skills", new ItemStack(Items.DIAMOND_SWORD))); + buttons.add(new QuickNavButton(1, screenTitle.contains("Collection"), "collection", new ItemStack(Items.PAINTING))); - buttons.add(new QuickNavButton(3, screenTitle.contains("Pets"), "/pets", new ItemStack(Items.BONE))); - buttons.add(new QuickNavButton(4, screenTitle.contains("Wardrobe"), "/wardrobe", ItemStack.fromNbt(StringNbtReader.parse("{id:\"minecraft:leather_chestplate\", Count:1, tag:{display:{color:8991416}}}")))); - buttons.add(new QuickNavButton(5, screenTitle.contains("Storage"), "/storage", new ItemStack(Items.ENDER_CHEST))); + buttons.add(new QuickNavButton(3, screenTitle.contains("Pets"), "pets", new ItemStack(Items.BONE))); + buttons.add(new QuickNavButton(4, screenTitle.contains("Wardrobe"), "wardrobe", ItemStack.fromNbt(StringNbtReader.parse("{id:\"minecraft:leather_chestplate\", Count:1, tag:{display:{color:8991416}}}")))); + buttons.add(new QuickNavButton(5, screenTitle.contains("Storage"), "storage", new ItemStack(Items.ENDER_CHEST))); - buttons.add(new QuickNavButton(6, false, "/warp hub", ItemStack.fromNbt(StringNbtReader.parse(skyblockHubIconNbt)))); - buttons.add(new QuickNavButton(7, false, "/warp dungeon_hub", ItemStack.fromNbt(StringNbtReader.parse(dungeonHubIconNbt)))); + buttons.add(new QuickNavButton(6, false, "warp hub", ItemStack.fromNbt(StringNbtReader.parse(skyblockHubIconNbt)))); + buttons.add(new QuickNavButton(7, false, "warp dungeon_hub", ItemStack.fromNbt(StringNbtReader.parse(dungeonHubIconNbt)))); - buttons.add(new QuickNavButton(9, screenTitle.contains("Enchant Item"), "/etable", new ItemStack(Items.ENCHANTING_TABLE))); - buttons.add(new QuickNavButton(10, screenTitle.contains("Anvil"), "/anvil", new ItemStack(Items.ANVIL))); - buttons.add(new QuickNavButton(11, screenTitle.contains("Craft Item"), "/craft", new ItemStack(Items.CRAFTING_TABLE))); + buttons.add(new QuickNavButton(9, screenTitle.contains("Enchant Item"), "etable", new ItemStack(Items.ENCHANTING_TABLE))); + buttons.add(new QuickNavButton(10, screenTitle.contains("Anvil"), "anvil", new ItemStack(Items.ANVIL))); + buttons.add(new QuickNavButton(11, screenTitle.contains("Craft Item"), "craft", new ItemStack(Items.CRAFTING_TABLE))); } catch (CommandSyntaxException e) { e.printStackTrace(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index c60dec3c..3317a54f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -57,8 +57,7 @@ public class QuickNavButton extends ClickableWidget { public void onClick(double mouseX, double mouseY) { if (!this.toggled) { this.toggled = true; - // CLIENT.player.sendChatMessage(command, Text.of(command)); - CLIENT.player.sendMessage(Text.of(command)); + CLIENT.player.networkHandler.sendCommand(command); // TODO : add null check with log error } } -- cgit From 542e60cb90c4c0cdc932f3cfb3529ea33a2f2970 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 17 Mar 2023 01:30:40 -0400 Subject: Fix Quiz Answer + Support for #111 --- .../java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java | 12 ++++++++---- .../me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java | 7 ++++--- .../skyblocker/skyblock/quicknav/QuickNavButton.java | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java index b437ce10..81bee4ba 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java @@ -1,5 +1,12 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; + import me.xmrvizzy.skyblocker.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.chat.ChatPatternListener; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; @@ -8,9 +15,6 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -import java.util.*; -import java.util.regex.Matcher; - public class Trivia extends ChatPatternListener { private static final Map answers; private List solutions = Collections.emptyList(); @@ -65,7 +69,7 @@ public class Trivia extends ChatPatternListener { answers.put("What is the status of Storm?", new String[]{"The Wither Lords"}); answers.put("What is the status of Necron?", new String[]{"The Wither Lords"}); answers.put("What is the status of Maxor, Storm, Goldor and Necron?", new String[]{"The Wither Lords"}); - answers.put("How many total Fairy Souls are there?", new String[]{"238 Fairy Souls"}); + answers.put("How many total Fairy Souls are there?", new String[]{"239 Fairy Souls"}); answers.put("How many Fairy Souls are there in Spider's Den?", new String[]{"19 Fairy Souls"}); answers.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"}); answers.put("How many Fairy Souls are there in The Farming Islands?", new String[]{"20 Fairy Souls"}); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java index 9c1ed300..62f8c34d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java @@ -1,13 +1,14 @@ package me.xmrvizzy.skyblocker.skyblock.quicknav; +import java.util.ArrayList; +import java.util.List; + import com.mojang.brigadier.exceptions.CommandSyntaxException; + import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.StringNbtReader; -import java.util.ArrayList; -import java.util.List; - public class QuickNav { private static final String skyblockHubIconNbt = "{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}}"; private static final String dungeonHubIconNbt = "{id:\"minecraft:player_head\",Count:1,tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}}"; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index 3123f204..e1ac3c5f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -57,7 +57,7 @@ public class QuickNavButton extends ClickableWidget { public void onClick(double mouseX, double mouseY) { if (!this.toggled) { this.toggled = true; - CLIENT.player.networkHandler.sendCommand(command); + CLIENT.player.networkHandler.sendCommand(command.replace("/", "")); // TODO : add null check with log error } } -- cgit