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') 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