Port to 26.1

lonefelidae16 · lonefelidae16 · commit 19efe47e6c9c · 2026-03-26T14:38:33.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
-    id 'fabric-loom' version "${loom_version}"
+    id 'net.fabricmc.fabric-loom' version "${loom_version}"
     id 'maven-publish'
     id 'com.jfrog.artifactory' version '5.+'
 }
 
 apply from: 'https://gitlab.kow08absty.com/-/snippets/1/raw/main/properties-reader.gradle'
 
-var targetJdk = 21
+var targetJdk = Integer.parseInt(project.java_jang_version)
 
 version = "${project.mod_version}+${minecraft_version}"
 group = project.maven_group
@@ -30,8 +30,7 @@ repositories {
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     //modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
@@ -41,9 +40,9 @@ dependencies {
 
     // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 
-    modCompileOnly "com.terraformersmc:modmenu:${mod_menu_version}"
-    modRuntimeOnly "com.terraformersmc:modmenu:${mod_menu_version}"
-    modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    compileOnly "com.terraformersmc:modmenu:${mod_menu_version}"
+    runtimeOnly "com.terraformersmc:modmenu:${mod_menu_version}"
+    runtimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }
 
 processResources {
diff --git a/gradle.properties b/gradle.properties
@@ -4,16 +4,17 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.4
+minecraft_version=26.1
 loader_version=0.18.4
 
+java_jang_version=25
+
 # Mod Properties
 mod_version=1.3.0
 maven_group=me.lonefelidae16
 archives_base_name=better-look-enchant
 
 # Dependencies
-fabric_version=0.141.3+1.21.11
-mod_menu_version=17.0.0-beta.2
+fabric_version=0.144.0+26.1
+mod_menu_version=18.0.0-alpha.8
 loom_version=1.15-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/BetterLookEnchantConfig.java b/src/main/java/me/lonefelidae16/betterlookenchant/BetterLookEnchantConfig.java
@@ -4,8 +4,7 @@
 import com.google.gson.JsonParseException;
 import me.lonefelidae16.betterlookenchant.client.gui.Color;
 import me.lonefelidae16.betterlookenchant.client.gui.TextFormat;
-import net.minecraft.enchantment.Enchantments;
-
+import net.minecraft.world.item.enchantment.Enchantments;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -32,12 +31,12 @@ private BetterLookEnchantConfig() {
         // set up defaults
         enabledEnchants = new ArrayList<>();
         enabledEnchants.add(ENTRY_KEY_LV_MAX_FORMAT);
-        enabledEnchants.add(Enchantments.MENDING.getValue().toString());
-        enabledEnchants.add(Enchantments.INFINITY.getValue().toString());
+        enabledEnchants.add(Enchantments.MENDING.identifier().toString());
+        enabledEnchants.add(Enchantments.INFINITY.identifier().toString());
         customFormats = new HashMap<>();
         customFormats.put(ENTRY_KEY_LV_MAX_FORMAT, new TextFormat(Color.MC_GREEN.argb()));
-        customFormats.put(Enchantments.MENDING.getValue().toString(), new TextFormat(Color.MC_GOLD.argb()));
-        customFormats.put(Enchantments.INFINITY.getValue().toString(), new TextFormat(Color.MC_LIGHT_PURPLE.argb()));
+        customFormats.put(Enchantments.MENDING.identifier().toString(), new TextFormat(Color.MC_GOLD.argb()));
+        customFormats.put(Enchantments.INFINITY.identifier().toString(), new TextFormat(Color.MC_LIGHT_PURPLE.argb()));
     }
 
     public static void reload() {
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/TextFormat.java b/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/TextFormat.java
@@ -1,11 +1,10 @@
 package me.lonefelidae16.betterlookenchant.client.gui;
 
-import net.minecraft.text.Style;
-import net.minecraft.text.TextColor;
-import net.minecraft.util.Colors;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
+import net.minecraft.network.chat.Style;
+import net.minecraft.util.CommonColors;
 
 public final class TextFormat {
     private final Integer color;
@@ -50,10 +49,10 @@ public boolean isStrike() {
     }
 
     public Style asStyle() {
-        return Style.EMPTY.withColor(Objects.requireNonNullElse(this.color, Colors.WHITE))
+        return Style.EMPTY.withColor(Objects.requireNonNullElse(this.color, CommonColors.WHITE))
                 .withBold(this.isBold)
                 .withItalic(this.isItalic)
-                .withUnderline(this.isUnderline)
+                .withUnderlined(this.isUnderline)
                 .withStrikethrough(this.isStrike);
     }
 
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/screen/BetterLookEnchantConfigScreen.java b/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/screen/BetterLookEnchantConfigScreen.java
@@ -5,19 +5,19 @@
 import me.lonefelidae16.betterlookenchant.client.gui.widget.TextFormatListWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.DirectionalLayoutWidget;
-import net.minecraft.client.gui.widget.ThreePartsLayoutWidget;
-import net.minecraft.screen.ScreenTexts;
-import net.minecraft.text.Text;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
+import net.minecraft.client.gui.layouts.LinearLayout;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
 
 @Environment(EnvType.CLIENT)
 public class BetterLookEnchantConfigScreen extends Screen {
-    private static final Text TITLE_TEXT = Text.translatable("text.betterlookenchant.config.title");
+    private static final Component TITLE_TEXT = Component.translatable("text.betterlookenchant.config.title");
 
     private final Screen parent;
-    public final ThreePartsLayoutWidget layout = new ThreePartsLayoutWidget(this);
+    public final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this);
     private TextFormatListWidget list;
 
     public BetterLookEnchantConfigScreen(Screen parent) {
@@ -27,41 +27,41 @@ public BetterLookEnchantConfigScreen(Screen parent) {
 
     @Override
     protected void init() {
-        this.layout.addHeader(TITLE_TEXT, this.textRenderer);
+        this.layout.addTitleHeader(TITLE_TEXT, this.font);
 
-        this.list = new TextFormatListWidget(this.client, this.width, this);
-        this.layout.addBody(this.list);
+        this.list = new TextFormatListWidget(this.minecraft, this.width, this);
+        this.layout.addToContents(this.list);
 
-        DirectionalLayoutWidget footer = DirectionalLayoutWidget.horizontal().spacing(8);
-        footer.add(
-                ButtonWidget.builder(ScreenTexts.CANCEL, (button) -> {
+        LinearLayout footer = LinearLayout.horizontal().spacing(8);
+        footer.addChild(
+                Button.builder(CommonComponents.GUI_CANCEL, (button) -> {
                             BetterLookEnchantConfig.reload();
-                            this.close();
+                            this.onClose();
                         })
                         .build()
         );
-        footer.add(
-                ButtonWidget.builder(Text.translatable("text.betterlookenchant.config.save"), (button) -> {
+        footer.addChild(
+                Button.builder(Component.translatable("text.betterlookenchant.config.save"), (button) -> {
                             BetterLookEnchantConfig.writeFile(BetterLookEnchantClient.STATE_FILE);
-                            this.close();
+                            this.onClose();
                         })
                         .build()
         );
-        this.layout.addFooter(footer);
+        this.layout.addToFooter(footer);
 
-        this.layout.refreshPositions();
-        this.layout.forEachChild(this::addDrawableChild);
+        this.layout.arrangeElements();
+        this.layout.visitWidgets(this::addRenderableWidget);
     }
 
     @Override
-    protected void refreshWidgetPositions() {
-        this.layout.refreshPositions();
-        this.list.position(this.width, this.layout);
+    protected void repositionElements() {
+        this.layout.arrangeElements();
+        this.list.updateSize(this.width, this.layout);
     }
 
     public void refresh() {
         this.list.visible = false;
-        this.clearChildren();
+        this.clearWidgets();
         this.init();
     }
 }
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/widget/CustomElementListWidgetBase.java b/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/widget/CustomElementListWidgetBase.java
@@ -1,53 +1,52 @@
 package me.lonefelidae16.betterlookenchant.client.gui.widget;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.Selectable;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-
 import java.util.ArrayList;
 import java.util.List;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.narration.NarratableEntry;
 
 /**
  * Base class of ElementListWidget
  *
  * @param <E> its own class that extended CustomElementListWidgetBase.EntryBase
  */
-public abstract class CustomElementListWidgetBase<E extends CustomElementListWidgetBase.EntryBase<E>> extends ElementListWidget<E> {
-    public CustomElementListWidgetBase(MinecraftClient client, int width, int height, int y, int itemHeight) {
+public abstract class CustomElementListWidgetBase<E extends CustomElementListWidgetBase.EntryBase<E>> extends ContainerObjectSelectionList<E> {
+    public CustomElementListWidgetBase(Minecraft client, int width, int height, int y, int itemHeight) {
         super(client, width, height, y, itemHeight);
     }
 
-    public static abstract class EntryBase<E extends ElementListWidget.Entry<E>> extends ElementListWidget.Entry<E> {
-        protected final List<ClickableWidget> elements;
+    public static abstract class EntryBase<E extends ContainerObjectSelectionList.Entry<E>> extends ContainerObjectSelectionList.Entry<E> {
+        protected final List<AbstractWidget> elements;
 
         protected EntryBase() {
             super();
             this.elements = new ArrayList<>();
         }
 
-        protected <T extends ClickableWidget> T addElement(T element) {
+        protected <T extends AbstractWidget> T addElement(T element) {
             this.elements.add(element);
             return element;
         }
 
         @Override
-        public List<? extends Element> children() {
+        public List<? extends GuiEventListener> children() {
             return this.elements;
         }
 
         @Override
-        public List<? extends Selectable> selectableChildren() {
+        public List<? extends NarratableEntry> narratables() {
             return this.elements;
         }
 
         @Override
-        public void render(DrawContext context, int mouseX, int mouseY, boolean hovered, float deltaTicks) {
-            for (ClickableWidget widget : this.elements) {
+        public void extractContent(GuiGraphicsExtractor context, int mouseX, int mouseY, boolean hovered, float deltaTicks) {
+            for (AbstractWidget widget : this.elements) {
                 widget.setY(this.getY());
-                widget.render(context, mouseX, mouseY, deltaTicks);
+                widget.extractRenderState(context, mouseX, mouseY, deltaTicks);
             }
         }
     }
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/widget/EnchantmentEditWidget.java b/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/widget/EnchantmentEditWidget.java
@@ -1,28 +1,28 @@
 package me.lonefelidae16.betterlookenchant.client.gui.widget;
 
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.input.KeyInput;
-import net.minecraft.text.Text;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.network.chat.Component;
 import org.lwjgl.glfw.GLFW;
 
-public class EnchantmentEditWidget extends TextFieldWidget {
+public class EnchantmentEditWidget extends EditBox {
     private SubmitListener listener;
 
-    EnchantmentEditWidget(TextRenderer textRenderer, int x, int y, int width, int height, Text text) {
+    EnchantmentEditWidget(Font textRenderer, int x, int y, int width, int height, Component text) {
         super(textRenderer, x, y, width, height, text);
         this.visible = false;
     }
 
     static class Builder {
-        private final TextRenderer renderer;
+        private final Font renderer;
         private int x;
         private int y;
         private int width = 110;
         private int height = 20;
         private SubmitListener listener;
 
-        Builder(TextRenderer renderer, int x, int y) {
+        Builder(Font renderer, int x, int y) {
             this.renderer = renderer;
             this.x = x;
             this.y = y;
@@ -50,15 +50,15 @@ public Builder submitListener(SubmitListener listener) {
         }
 
         public EnchantmentEditWidget build() {
-            var result = new EnchantmentEditWidget(this.renderer, this.x, this.y, this.width, this.height, Text.empty());
+            var result = new EnchantmentEditWidget(this.renderer, this.x, this.y, this.width, this.height, Component.empty());
             if (this.listener != null) {
                 result.setSubmitListener(this.listener);
             }
             return result;
         }
     }
 
-    public static Builder builder(TextRenderer renderer, int x, int y) {
+    public static Builder builder(Font renderer, int x, int y) {
         return new Builder(renderer, x, y);
     }
 
@@ -67,13 +67,13 @@ public void setSubmitListener(SubmitListener listener) {
     }
 
     @Override
-    public boolean keyPressed(KeyInput input) {
-        if (input.getKeycode() == GLFW.GLFW_KEY_ENTER) {
+    public boolean keyPressed(KeyEvent input) {
+        if (input.input() == GLFW.GLFW_KEY_ENTER) {
             if (this.listener != null) {
                 this.listener.onSubmit(this);
                 return true;
             }
-        } else if (input.getKeycode() == GLFW.GLFW_KEY_ESCAPE) {
+        } else if (input.input() == GLFW.GLFW_KEY_ESCAPE) {
             if (this.listener != null) {
                 this.listener.onCancel(this);
                 return true;
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/widget/TextFormatListWidget.java b/src/main/java/me/lonefelidae16/betterlookenchant/client/gui/widget/TextFormatListWidget.java
diff --git a/src/main/java/me/lonefelidae16/betterlookenchant/mixin/EnchantmentMixin.java b/src/main/java/me/lonefelidae16/betterlookenchant/mixin/EnchantmentMixin.java
