feat: 1.19.3 update

skyecodes · skyecodes · commit 248fef3dce4a · 2022-12-10T15:18:15.000+01:00
diff --git a/common/src/main/java/com/github/franckyi/guapi/api/RenderHelper.java b/common/src/main/java/com/github/franckyi/guapi/api/RenderHelper.java
@@ -67,7 +67,7 @@ public static void drawTexture(PoseStack matrices, ResourceLocation id, int x, i
     }
 
     public static void drawSprite(PoseStack matrices, TextureAtlasSprite sprite, int x, int y, int imageWidth, int imageHeight) {
-        RenderSystem.setShaderTexture(0, sprite.atlas().location());
+        RenderSystem.setShaderTexture(0, sprite.atlasLocation());
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         GuiComponent.blit(matrices, x, y, 0, imageWidth, imageHeight, sprite);
     }
diff --git a/common/src/main/java/com/github/franckyi/guapi/api/node/ItemView.java b/common/src/main/java/com/github/franckyi/guapi/api/node/ItemView.java
@@ -24,4 +24,14 @@ default boolean isDrawDecorations() {
     default void setDrawDecorations(boolean value) {
         drawDecorationsProperty().setValue(value);
     }
+
+    default boolean isDrawTooltip() {
+        return drawTooltipProperty().getValue();
+    }
+
+    BooleanProperty drawTooltipProperty();
+
+    default void setDrawTooltip(boolean value) {
+        drawTooltipProperty().setValue(value);
+    }
 }
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/node/AbstractItemView.java b/common/src/main/java/com/github/franckyi/guapi/base/node/AbstractItemView.java
@@ -8,6 +8,7 @@
 public abstract class AbstractItemView extends AbstractControl implements ItemView {
     private final ObjectProperty<ItemStack> itemProperty = ObjectProperty.create();
     private final BooleanProperty drawDecorationsProperty = BooleanProperty.create(false);
+    private final BooleanProperty drawTooltipProperty = BooleanProperty.create(true);
 
     protected AbstractItemView() {
     }
@@ -25,4 +26,9 @@ public ObjectProperty<ItemStack> itemProperty() {
     public BooleanProperty drawDecorationsProperty() {
         return drawDecorationsProperty;
     }
+
+    @Override
+    public BooleanProperty drawTooltipProperty() {
+        return drawTooltipProperty;
+    }
 }
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/VanillaItemViewSkin.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/VanillaItemViewSkin.java
@@ -28,7 +28,7 @@ public void render(ItemView node, PoseStack matrices, int mouseX, int mouseY, fl
 
     @Override
     public void postRender(ItemView node, PoseStack matrices, int mouseX, int mouseY, float delta) {
-        if (node.isHovered() && node.getItem() != null) {
+        if (node.isHovered() && node.getItem() != null && node.isDrawTooltip()) {
             RenderHelper.drawTooltip(matrices, node.getItem(), mouseX, mouseY);
         }
         super.postRender(node, matrices, mouseX, mouseY, delta);
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaButtonSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaButtonSkinDelegate.java
@@ -2,12 +2,14 @@
 
 import com.github.franckyi.guapi.api.node.Button;
 
+import java.util.function.Supplier;
+
 public class VanillaButtonSkinDelegate<N extends Button> extends net.minecraft.client.gui.components.Button implements VanillaWidgetSkinDelegate {
     protected final N node;
 
     public VanillaButtonSkinDelegate(N node) {
         super(node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getLabel(), button -> {
-        });
+        }, Supplier::get);
         this.node = node;
         initLabeledWidget(node);
     }
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaCheckBoxSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaCheckBoxSkinDelegate.java
@@ -41,8 +41,8 @@ public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delt
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-        blit(poseStack, x, y, isHoveredOrFocused() ? 16 : 0, selected() ? 16 : 0, 16, 16, 32, 32);
+        blit(poseStack, getX(), getY(), isHoveredOrFocused() ? 16 : 0, selected() ? 16 : 0, 16, 16, 32, 32);
         renderBg(poseStack, mc, mouseX, mouseY);
-        drawString(poseStack, mc.font, getMessage(), x + 20, y + (height - mc.font.lineHeight - 1) / 2, 14737632 | Mth.ceil(alpha * 255.0F) << 24);
+        drawString(poseStack, mc.font, getMessage(), getX() + 20, getY() + (height - mc.font.lineHeight - 1) / 2, 14737632 | Mth.ceil(alpha * 255.0F) << 24);
     }
 }
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaSliderSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaSliderSkinDelegate.java
@@ -47,7 +47,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
     }
 
     private void updateNodeFromMouse(double mouseX) {
-        updateNode((mouseX - (x + 4)) / (width - 8));
+        updateNode((mouseX - (getX() + 4)) / (width - 8));
     }
 
     private void updateNode(double newRawValue) {
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTextAreaSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTextAreaSkinDelegate.java
@@ -13,7 +13,7 @@ public class VanillaTextAreaSkinDelegate<N extends TextArea> extends MultiLineEd
     private final MultilineTextFieldMixin textFieldMixin;
 
     public VanillaTextAreaSkinDelegate(N node) {
-        super(Minecraft.getInstance().font, node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getPlaceholder(), node.getLabel());
+        super(Minecraft.getInstance().font, node.getX(), node.getY(), node.getWidth() - 8, node.getHeight(), node.getPlaceholder(), node.getLabel());
         this.node = node;
         self = (MultiLineEditBoxMixin) this;
         textFieldMixin = (MultilineTextFieldMixin) self.getTextField();
@@ -22,11 +22,11 @@ public VanillaTextAreaSkinDelegate(N node) {
         setValue(node.getText());
         setFocused(node.isFocused());
         setValueListener(node::setText);
-        node.xProperty().addListener(newVal -> x = newVal);
-        node.yProperty().addListener(newVal -> y = newVal);
+        node.xProperty().addListener(this::setX);
+        node.yProperty().addListener(this::setY);
         node.widthProperty().addListener(newVal -> {
-            setWidth(newVal);
-            textFieldMixin.setWidth(newVal);
+            setWidth(newVal - 8);
+            textFieldMixin.setWidth(newVal - 8);
             textFieldMixin.invokeReflowDisplayLines();
         });
         node.heightProperty().addListener(newVal -> height = newVal);
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTextFieldSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTextFieldSkinDelegate.java
@@ -28,8 +28,8 @@ public VanillaTextFieldSkinDelegate(N node) {
         setValue(node.getText());
         setFocused(node.isFocused());
         setResponder(node::setText);
-        node.xProperty().addListener(newVal -> x = newVal + 1);
-        node.yProperty().addListener(newVal -> y = newVal + 1);
+        node.xProperty().addListener(newVal -> setX(newVal + 1));
+        node.yProperty().addListener(newVal -> setY(newVal + 1));
         node.widthProperty().addListener(newVal -> setWidth(newVal - 2));
         node.heightProperty().addListener(newVal -> height = newVal - 2);
         node.disabledProperty().addListener(newVal -> active = !newVal);
@@ -137,7 +137,7 @@ protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY
         int displayPos = self.getDisplayPos();
         Font font = Minecraft.getInstance().font;
         FormattedText string = font.substrByWidth(renderText(getValue().substring(displayPos), displayPos), getInnerWidth());
-        setHighlightPos(font.substrByWidth(string, Mth.floor(mouseX) - x - 4).getString().length() + displayPos);
+        setHighlightPos(font.substrByWidth(string, Mth.floor(mouseX) - getX() - 4).getString().length() + displayPos);
     }
 
     @Override
@@ -146,13 +146,13 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (!isVisible()) {
             return false;
         } else {
-            boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
+            boolean flag = mouseX >= getX() && mouseX < getX() + width && mouseY >= getY() && mouseY < getY() + height;
             if (self.canLoseFocus() && button == 0) {
                 setFocus(flag);
             }
 
             if (isFocused() && flag && button == 0) {
-                int i = Mth.floor(mouseX) - x;
+                int i = Mth.floor(mouseX) - getX();
                 if (self.isBordered()) {
                     i -= 4;
                 }
@@ -172,8 +172,8 @@ public void renderButton(@NotNull PoseStack matrices, int mouseX, int mouseY, fl
         if (isVisible()) {
             if (self.isBordered()) {
                 int i = isFocused() ? -1 : -6250336;
-                fill(matrices, x - 1, y - 1, x + width + 1, y + height + 1, i);
-                fill(matrices, x, y, x + width, y + height, -16777216);
+                fill(matrices, getX() - 1, getY() - 1, getX() + width + 1, getY() + height + 1, i);
+                fill(matrices, getX(), getY(), getX() + width, getY() + height, -16777216);
             }
 
             int i2 = self.isEditable() ? self.getTextColor() : self.getTextColorUneditable();
@@ -185,8 +185,8 @@ public void renderButton(@NotNull PoseStack matrices, int mouseX, int mouseY, fl
                     : font.plainSubstrByWidth(getValue().substring(self.getDisplayPos()), this.getInnerWidth());
             boolean flag = j >= 0 && j <= s.length();
             boolean flag1 = isFocused() && self.getFrame() / 6 % 2 == 0 && flag;
-            int l = self.isBordered() ? x + 4 : x;
-            int i1 = self.isBordered() ? y + (height - 8) / 2 : y;
+            int l = self.isBordered() ? getX() + 4 : getX();
+            int i1 = self.isBordered() ? getY() + (height - 8) / 2 : getY();
             int j1 = l;
             if (k > s.length()) {
                 k = s.length();
@@ -237,7 +237,7 @@ public void renderButton(@NotNull PoseStack matrices, int mouseX, int mouseY, fl
                 int previousTextWidth = font.width(previousText);
                 Component highlightedText = renderText(getValue().substring(start, end), start);
                 int highlightedTextWidth = font.width(highlightedText);
-                int x0 = x + 4;
+                int x0 = getX() + 4;
                 self.invokeRenderHighlight(x0 + previousTextWidth, i1 - 1, x0 + previousTextWidth + highlightedTextWidth, i1 + 1 + 9);
             }
 
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTexturedButtonSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTexturedButtonSkinDelegate.java
@@ -6,12 +6,14 @@
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Supplier;
+
 public class VanillaTexturedButtonSkinDelegate<N extends TexturedButton> extends Button implements VanillaWidgetSkinDelegate {
     protected final N node;
 
     public VanillaTexturedButtonSkinDelegate(N node) {
         super(node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getTooltip().isEmpty() ? Component.empty() : node.getTooltip().get(0), button -> {
-        });
+        }, Supplier::get);
         this.node = node;
         initNodeWidget(node);
     }
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaWidgetSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaWidgetSkinDelegate.java
@@ -7,10 +7,9 @@
 import com.github.franckyi.guapi.api.node.Node;
 import com.github.franckyi.ibeeditor.mixin.AbstractWidgetMixin;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Widget;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 
-public interface VanillaWidgetSkinDelegate extends Renderable, EventTarget, GuiEventListener, Widget {
+public interface VanillaWidgetSkinDelegate extends Renderable, EventTarget, GuiEventListener {
     @Override
     default void mouseClicked(MouseButtonEvent event) {
         mouseClicked(event.getMouseX(), event.getMouseY(), event.getButton());
@@ -55,8 +54,8 @@ default void initNodeWidget(Node node) {
         AbstractWidget widget = (AbstractWidget) this;
         widget.active = !node.isDisabled();
         widget.visible = node.isVisible();
-        node.xProperty().addListener(newVal -> widget.x = newVal);
-        node.yProperty().addListener(newVal -> widget.y = newVal);
+        node.xProperty().addListener(widget::setX);
+        node.yProperty().addListener(widget::setY);
         node.widthProperty().addListener(widget::setWidth);
         node.heightProperty().addListener(((AbstractWidgetMixin) widget)::setHeight);
         node.disabledProperty().addListener(newVal -> widget.active = !newVal);
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/ClientCache.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/ClientCache.java
@@ -4,14 +4,19 @@
 import com.github.franckyi.ibeeditor.client.screen.model.selection.element.*;
 import com.github.franckyi.ibeeditor.common.ColoredItemHelper;
 import net.minecraft.client.Minecraft;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentCategory;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 public final class ClientCache {
@@ -29,23 +34,23 @@ public final class ClientCache {
     private static List<SpriteListSelectionElementModel> effectSelectionItems;
 
     public static List<String> getItemSuggestions() {
-        return itemSuggestions == null ? itemSuggestions = buildSuggestions(Registry.ITEM) : itemSuggestions;
+        return itemSuggestions == null ? itemSuggestions = buildSuggestions(BuiltInRegistries.ITEM) : itemSuggestions;
     }
 
     public static List<ItemListSelectionElementModel> getItemSelectionItems() {
         return itemSelectionItems == null ? itemSelectionItems = buildItemSelectionItems() : itemSelectionItems;
     }
 
     public static List<String> getBlockSuggestions() {
-        return blockSuggestions == null ? blockSuggestions = buildSuggestions(Registry.BLOCK) : blockSuggestions;
+        return blockSuggestions == null ? blockSuggestions = buildSuggestions(BuiltInRegistries.BLOCK) : blockSuggestions;
     }
 
     public static List<ItemListSelectionElementModel> getBlockSelectionItems() {
         return blockSelectionItems == null ? blockSelectionItems = buildBlockSelectionItems() : blockSelectionItems;
     }
 
     public static List<String> getEnchantmentSuggestions() {
-        return enchantmentSuggestions == null ? enchantmentSuggestions = buildSuggestions(Registry.ENCHANTMENT) : enchantmentSuggestions;
+        return enchantmentSuggestions == null ? enchantmentSuggestions = buildSuggestions(BuiltInRegistries.ENCHANTMENT) : enchantmentSuggestions;
     }
 
     public static List<SortedEnchantmentListSelectionElementModel> getSortedEnchantmentSelectionItems(ItemStack target) {
@@ -84,23 +89,23 @@ public static List<SortedEnchantmentListSelectionElementModel> getSortedEnchantm
     }
 
     public static List<String> getAttributeSuggestions() {
-        return attributeSuggestions == null ? attributeSuggestions = buildSuggestions(Registry.ATTRIBUTE) : attributeSuggestions;
+        return attributeSuggestions == null ? attributeSuggestions = buildSuggestions(BuiltInRegistries.ATTRIBUTE) : attributeSuggestions;
     }
 
     public static List<ListSelectionElementModel> getAttributeSelectionItems() {
         return attributeSelectionItems == null ? attributeSelectionItems = buildAttributeSelectionItems() : attributeSelectionItems;
     }
 
     public static List<String> getPotionSuggestions() {
-        return potionSuggestions == null ? potionSuggestions = buildSuggestions(Registry.POTION) : potionSuggestions;
+        return potionSuggestions == null ? potionSuggestions = buildSuggestions(BuiltInRegistries.POTION) : potionSuggestions;
     }
 
     public static List<ItemListSelectionElementModel> getPotionSelectionItems() {
         return potionSelectionItems == null ? potionSelectionItems = buildPotionSelectionItems() : potionSelectionItems;
     }
 
     public static List<String> getEffectSuggestions() {
-        return effectSuggestions == null ? effectSuggestions = buildSuggestions(Registry.MOB_EFFECT) : effectSuggestions;
+        return effectSuggestions == null ? effectSuggestions = buildSuggestions(BuiltInRegistries.MOB_EFFECT) : effectSuggestions;
     }
 
     public static List<SpriteListSelectionElementModel> getEffectSelectionItems() {
@@ -122,21 +127,21 @@ private static List<String> buildSuggestions(Registry<?> registry) {
     }
 
     private static List<ItemListSelectionElementModel> buildItemSelectionItems() {
-        return Registry.ITEM.entrySet().stream()
+        return BuiltInRegistries.ITEM.entrySet().stream()
                 .map(e -> new ItemListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), new ItemStack(e.getValue())))
-                .toList();
+                .sorted().toList();
     }
 
     private static List<ItemListSelectionElementModel> buildBlockSelectionItems() {
-        return Registry.BLOCK.entrySet().stream()
+        return BuiltInRegistries.BLOCK.entrySet().stream()
                 .map(e -> new ItemListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), new ItemStack(e.getValue())))
-                .toList();
+                .sorted().toList();
     }
 
     private static List<EnchantmentListSelectionElementModel> buildEnchantmentSelectionItems() {
-        return Registry.ENCHANTMENT.entrySet().stream()
+        return BuiltInRegistries.ENCHANTMENT.entrySet().stream()
                 .map(e -> new EnchantmentListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), e.getValue(), new ItemStack(getEnchantmentTypeItem(e.getValue()))))
-                .toList();
+                .sorted().toList();
     }
 
     private static Item getEnchantmentTypeItem(Enchantment e) {
@@ -171,21 +176,21 @@ private static Item getEnchantmentTypeItem(Enchantment e) {
     }
 
     private static List<ListSelectionElementModel> buildAttributeSelectionItems() {
-        return Registry.ATTRIBUTE.entrySet().stream()
+        return BuiltInRegistries.ATTRIBUTE.entrySet().stream()
                 .map(e -> new ListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location()))
-                .toList();
+                .sorted().toList();
     }
 
     private static List<ItemListSelectionElementModel> buildPotionSelectionItems() {
-        return Registry.POTION.entrySet().stream()
+        return BuiltInRegistries.POTION.entrySet().stream()
                 .map(e -> new ItemListSelectionElementModel(e.getValue().getName(Items.POTION.getDescriptionId() + ".effect."), e.getKey().location(), ColoredItemHelper.createColoredPotionItem(e.getKey().location(), Color.NONE)))
-                .toList();
+                .sorted().toList();
     }
 
     private static List<SpriteListSelectionElementModel> buildEffectSelectionItems() {
-        return Registry.MOB_EFFECT.entrySet().stream()
+        return BuiltInRegistries.MOB_EFFECT.entrySet().stream()
                 .map(e -> new SpriteListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), () -> Minecraft.getInstance().getMobEffectTextures().get(e.getValue())))
-                .toList();
+                .sorted().toList();
     }
 
 }
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/context/BlockEditorContext.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/context/BlockEditorContext.java
@@ -3,6 +3,7 @@
 import com.github.franckyi.ibeeditor.common.ModTexts;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -47,7 +48,7 @@ public String getCommandName() {
     @Override
     protected String getCommand() {
         String blockStateStr = getBlockState().toString();
-        return String.format("/setblock ~ ~ ~ %s%s%s replace", Registry.BLOCK.getKey(getBlockState().getBlock()),
+        return String.format("/setblock ~ ~ ~ %s%s%s replace", BuiltInRegistries.BLOCK.getKey(getBlockState().getBlock()),
                 getBlockState().getProperties().isEmpty() ? "" : blockStateStr.substring(blockStateStr.indexOf("[")), getTag());
     }
 }
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/logic/ClientEditorRequestLogic.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/logic/ClientEditorRequestLogic.java
@@ -17,6 +17,7 @@
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.HitResult;
@@ -90,7 +91,7 @@ public static boolean requestInventoryItemEditor(EditorType editorType, Abstract
                 if (screen instanceof CreativeModeInventoryScreen c) {
                     creativeInventoryScreen = true;
                     // "survival inventory" creative tab slot indexes are different, need a hacky fix to get the actual inventory slot id
-                    if (c.getSelectedTab() == CreativeModeTab.TAB_INVENTORY.getId()) {
+                    if (c.isInventoryOpen()) {
                         slotIndex = ClientUtil.convertCreativeInventorySlot(slotIndex);
                     }
                 }
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/controller/selection/element/ItemListSelectionElementController.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/controller/selection/element/ItemListSelectionElementController.java
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/entry/item/PotionEffectEntryModel.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/entry/item/PotionEffectEntryModel.java
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/selection/element/ListSelectionElementModel.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/selection/element/ListSelectionElementModel.java
diff --git a/fabric/build.gradle b/fabric/build.gradle
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static void drawTexture(PoseStack matrices, ResourceLocation id, int x, i`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public static void drawSprite(PoseStack matrices, TextureAtlasSprite sprite, int x, int y, int imageWidth, int imageHeight) {`
`70`		`- RenderSystem.setShaderTexture(0, sprite.atlas().location());`
	`70`	`+ RenderSystem.setShaderTexture(0, sprite.atlasLocation());`
`71`	`71`	`RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);`
`72`	`72`	`GuiComponent.blit(matrices, x, y, 0, imageWidth, imageHeight, sprite);`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`public abstract class AbstractItemView extends AbstractControl implements ItemView {`
`9`	`9`	`private final ObjectProperty<ItemStack> itemProperty = ObjectProperty.create();`
`10`	`10`	`private final BooleanProperty drawDecorationsProperty = BooleanProperty.create(false);`
	`11`	`+ private final BooleanProperty drawTooltipProperty = BooleanProperty.create(true);`
`11`	`12`
`12`	`13`	`protected AbstractItemView() {`
`13`	`14`	`}`
`@@ -25,4 +26,9 @@ public ObjectProperty<ItemStack> itemProperty() {`
`25`	`26`	`public BooleanProperty drawDecorationsProperty() {`
`26`	`27`	`return drawDecorationsProperty;`
`27`	`28`	`}`
	`29`	`+`
	`30`	`+ @Override`
	`31`	`+ public BooleanProperty drawTooltipProperty() {`
	`32`	`+ return drawTooltipProperty;`
	`33`	`+ }`
`28`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void render(ItemView node, PoseStack matrices, int mouseX, int mouseY, fl`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public void postRender(ItemView node, PoseStack matrices, int mouseX, int mouseY, float delta) {`
`31`		`- if (node.isHovered() && node.getItem() != null) {`
	`31`	`+ if (node.isHovered() && node.getItem() != null && node.isDrawTooltip()) {`
`32`	`32`	`RenderHelper.drawTooltip(matrices, node.getItem(), mouseX, mouseY);`
`33`	`33`	`}`
`34`	`34`	`super.postRender(node, matrices, mouseX, mouseY, delta);`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delt`
`41`	`41`	`RenderSystem.enableBlend();`
`42`	`42`	`RenderSystem.defaultBlendFunc();`
`43`	`43`	`RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);`
`44`		`- blit(poseStack, x, y, isHoveredOrFocused() ? 16 : 0, selected() ? 16 : 0, 16, 16, 32, 32);`
	`44`	`+ blit(poseStack, getX(), getY(), isHoveredOrFocused() ? 16 : 0, selected() ? 16 : 0, 16, 16, 32, 32);`
`45`	`45`	`renderBg(poseStack, mc, mouseX, mouseY);`
`46`		`- drawString(poseStack, mc.font, getMessage(), x + 20, y + (height - mc.font.lineHeight - 1) / 2, 14737632 \| Mth.ceil(alpha * 255.0F) << 24);`
	`46`	`+ drawString(poseStack, mc.font, getMessage(), getX() + 20, getY() + (height - mc.font.lineHeight - 1) / 2, 14737632 \| Mth.ceil(alpha * 255.0F) << 24);`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`private void updateNodeFromMouse(double mouseX) {`
`50`		`- updateNode((mouseX - (x + 4)) / (width - 8));`
	`50`	`+ updateNode((mouseX - (getX() + 4)) / (width - 8));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private void updateNode(double newRawValue) {`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,19 @@`
`4`	`4`	`import com.github.franckyi.ibeeditor.client.screen.model.selection.element.*;`
`5`	`5`	`import com.github.franckyi.ibeeditor.common.ColoredItemHelper;`
`6`	`6`	`import net.minecraft.client.Minecraft;`
	`7`	`+import net.minecraft.core.HolderLookup;`
`7`	`8`	`import net.minecraft.core.Registry;`
	`9`	`+import net.minecraft.core.registries.BuiltInRegistries;`
	`10`	`+import net.minecraft.core.registries.Registries;`
	`11`	`+import net.minecraft.resources.ResourceKey;`
`8`	`12`	`import net.minecraft.world.item.Item;`
`9`	`13`	`import net.minecraft.world.item.ItemStack;`
`10`	`14`	`import net.minecraft.world.item.Items;`
`11`	`15`	`import net.minecraft.world.item.enchantment.Enchantment;`
`12`	`16`	`import net.minecraft.world.item.enchantment.EnchantmentCategory;`
`13`	`17`
`14`	`18`	`import java.util.ArrayList;`
	`19`	`+import java.util.Comparator;`
`15`	`20`	`import java.util.List;`
`16`	`21`
`17`	`22`	`public final class ClientCache {`
`@@ -29,23 +34,23 @@ public final class ClientCache {`
`29`	`34`	`private static List<SpriteListSelectionElementModel> effectSelectionItems;`
`30`	`35`
`31`	`36`	`public static List<String> getItemSuggestions() {`
`32`		`- return itemSuggestions == null ? itemSuggestions = buildSuggestions(Registry.ITEM) : itemSuggestions;`
	`37`	`+ return itemSuggestions == null ? itemSuggestions = buildSuggestions(BuiltInRegistries.ITEM) : itemSuggestions;`
`33`	`38`	`}`
`34`	`39`
`35`	`40`	`public static List<ItemListSelectionElementModel> getItemSelectionItems() {`
`36`	`41`	`return itemSelectionItems == null ? itemSelectionItems = buildItemSelectionItems() : itemSelectionItems;`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`public static List<String> getBlockSuggestions() {`
`40`		`- return blockSuggestions == null ? blockSuggestions = buildSuggestions(Registry.BLOCK) : blockSuggestions;`
	`45`	`+ return blockSuggestions == null ? blockSuggestions = buildSuggestions(BuiltInRegistries.BLOCK) : blockSuggestions;`
`41`	`46`	`}`
`42`	`47`
`43`	`48`	`public static List<ItemListSelectionElementModel> getBlockSelectionItems() {`
`44`	`49`	`return blockSelectionItems == null ? blockSelectionItems = buildBlockSelectionItems() : blockSelectionItems;`
`45`	`50`	`}`
`46`	`51`
`47`	`52`	`public static List<String> getEnchantmentSuggestions() {`
`48`		`- return enchantmentSuggestions == null ? enchantmentSuggestions = buildSuggestions(Registry.ENCHANTMENT) : enchantmentSuggestions;`
	`53`	`+ return enchantmentSuggestions == null ? enchantmentSuggestions = buildSuggestions(BuiltInRegistries.ENCHANTMENT) : enchantmentSuggestions;`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`public static List<SortedEnchantmentListSelectionElementModel> getSortedEnchantmentSelectionItems(ItemStack target) {`
`@@ -84,23 +89,23 @@ public static List<SortedEnchantmentListSelectionElementModel> getSortedEnchantm`
`84`	`89`	`}`
`85`	`90`
`86`	`91`	`public static List<String> getAttributeSuggestions() {`
`87`		`- return attributeSuggestions == null ? attributeSuggestions = buildSuggestions(Registry.ATTRIBUTE) : attributeSuggestions;`
	`92`	`+ return attributeSuggestions == null ? attributeSuggestions = buildSuggestions(BuiltInRegistries.ATTRIBUTE) : attributeSuggestions;`
`88`	`93`	`}`
`89`	`94`
`90`	`95`	`public static List<ListSelectionElementModel> getAttributeSelectionItems() {`
`91`	`96`	`return attributeSelectionItems == null ? attributeSelectionItems = buildAttributeSelectionItems() : attributeSelectionItems;`
`92`	`97`	`}`
`93`	`98`
`94`	`99`	`public static List<String> getPotionSuggestions() {`
`95`		`- return potionSuggestions == null ? potionSuggestions = buildSuggestions(Registry.POTION) : potionSuggestions;`
	`100`	`+ return potionSuggestions == null ? potionSuggestions = buildSuggestions(BuiltInRegistries.POTION) : potionSuggestions;`
`96`	`101`	`}`
`97`	`102`
`98`	`103`	`public static List<ItemListSelectionElementModel> getPotionSelectionItems() {`
`99`	`104`	`return potionSelectionItems == null ? potionSelectionItems = buildPotionSelectionItems() : potionSelectionItems;`
`100`	`105`	`}`
`101`	`106`
`102`	`107`	`public static List<String> getEffectSuggestions() {`
`103`		`- return effectSuggestions == null ? effectSuggestions = buildSuggestions(Registry.MOB_EFFECT) : effectSuggestions;`
	`108`	`+ return effectSuggestions == null ? effectSuggestions = buildSuggestions(BuiltInRegistries.MOB_EFFECT) : effectSuggestions;`
`104`	`109`	`}`
`105`	`110`
`106`	`111`	`public static List<SpriteListSelectionElementModel> getEffectSelectionItems() {`
`@@ -122,21 +127,21 @@ private static List<String> buildSuggestions(Registry<?> registry) {`
`122`	`127`	`}`
`123`	`128`
`124`	`129`	`private static List<ItemListSelectionElementModel> buildItemSelectionItems() {`
`125`		`- return Registry.ITEM.entrySet().stream()`
	`130`	`+ return BuiltInRegistries.ITEM.entrySet().stream()`
`126`	`131`	`.map(e -> new ItemListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), new ItemStack(e.getValue())))`
`127`		`- .toList();`
	`132`	`+ .sorted().toList();`
`128`	`133`	`}`
`129`	`134`
`130`	`135`	`private static List<ItemListSelectionElementModel> buildBlockSelectionItems() {`
`131`		`- return Registry.BLOCK.entrySet().stream()`
	`136`	`+ return BuiltInRegistries.BLOCK.entrySet().stream()`
`132`	`137`	`.map(e -> new ItemListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), new ItemStack(e.getValue())))`
`133`		`- .toList();`
	`138`	`+ .sorted().toList();`
`134`	`139`	`}`
`135`	`140`
`136`	`141`	`private static List<EnchantmentListSelectionElementModel> buildEnchantmentSelectionItems() {`
`137`		`- return Registry.ENCHANTMENT.entrySet().stream()`
	`142`	`+ return BuiltInRegistries.ENCHANTMENT.entrySet().stream()`
`138`	`143`	`.map(e -> new EnchantmentListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), e.getValue(), new ItemStack(getEnchantmentTypeItem(e.getValue()))))`
`139`		`- .toList();`
	`144`	`+ .sorted().toList();`
`140`	`145`	`}`
`141`	`146`
`142`	`147`	`private static Item getEnchantmentTypeItem(Enchantment e) {`
`@@ -171,21 +176,21 @@ private static Item getEnchantmentTypeItem(Enchantment e) {`
`171`	`176`	`}`
`172`	`177`
`173`	`178`	`private static List<ListSelectionElementModel> buildAttributeSelectionItems() {`
`174`		`- return Registry.ATTRIBUTE.entrySet().stream()`
	`179`	`+ return BuiltInRegistries.ATTRIBUTE.entrySet().stream()`
`175`	`180`	`.map(e -> new ListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location()))`
`176`		`- .toList();`
	`181`	`+ .sorted().toList();`
`177`	`182`	`}`
`178`	`183`
`179`	`184`	`private static List<ItemListSelectionElementModel> buildPotionSelectionItems() {`
`180`		`- return Registry.POTION.entrySet().stream()`
	`185`	`+ return BuiltInRegistries.POTION.entrySet().stream()`
`181`	`186`	`.map(e -> new ItemListSelectionElementModel(e.getValue().getName(Items.POTION.getDescriptionId() + ".effect."), e.getKey().location(), ColoredItemHelper.createColoredPotionItem(e.getKey().location(), Color.NONE)))`
`182`		`- .toList();`
	`187`	`+ .sorted().toList();`
`183`	`188`	`}`
`184`	`189`
`185`	`190`	`private static List<SpriteListSelectionElementModel> buildEffectSelectionItems() {`
`186`		`- return Registry.MOB_EFFECT.entrySet().stream()`
	`191`	`+ return BuiltInRegistries.MOB_EFFECT.entrySet().stream()`
`187`	`192`	`.map(e -> new SpriteListSelectionElementModel(e.getValue().getDescriptionId(), e.getKey().location(), () -> Minecraft.getInstance().getMobEffectTextures().get(e.getValue())))`
`188`		`- .toList();`
	`193`	`+ .sorted().toList();`
`189`	`194`	`}`
`190`	`195`
`191`	`196`	`}`