feat: 1.20.4 update, added Armor Trims hide flag, fixed unremovable lore bug

skyecodes · skyecodes · commit 83643f0ea74a · 2023-12-14T16:35:45.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -66,11 +66,11 @@ allprojects {
 }
 
 githubRelease {
-    setToken(findProperty("github_token") as String ?: System.getenv("GITHUB_TOKEN"))
+    setToken(findProperty("github_token") as String ?: System.getenv("GITHUB_TOKEN") ?: "")
     setOwner("skyecodes")
     setRepo("IBE-Editor")
     setTagName("${version}+${rootProject.major_minecraft_version}")
-    setTargetCommitish(findProperty("git_branch") as String ?: System.getenv("GIT_BRANCH"))
+    setTargetCommitish(findProperty("git_branch") as String ?: System.getenv("GIT_BRANCH") ?: "")
     setReleaseName("IBE Editor v${version} for Minecraft ${rootProject.minecraft_version}")
     setBody(versionInfoChangelog)
     setPrerelease(versionInfoType == "alpha")
diff --git a/common/build.gradle b/common/build.gradle
@@ -8,6 +8,10 @@ architectury {
     common("fabric", "forge", "neoforge")
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/ibeeditor.accesswidener")
+}
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/AbstractVanillaListNodeSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/AbstractVanillaListNodeSkinDelegate.java
@@ -9,7 +9,6 @@
 import com.github.franckyi.guapi.api.node.ListNode;
 import com.github.franckyi.guapi.api.node.Node;
 import com.github.franckyi.guapi.api.util.ScreenEventType;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractSelectionList;
@@ -25,7 +24,7 @@ public abstract class AbstractVanillaListNodeSkinDelegate<N extends ListNode<E>,
     protected boolean shouldChangeFocus = false;
 
     public AbstractVanillaListNodeSkinDelegate(N node) {
-        super(Minecraft.getInstance(), 0, 0, 0, 0, node.getItemHeight());
+        super(Minecraft.getInstance(), 0, 0, 0, node.getItemHeight());
         this.node = node;
         Runnable rs = this::shouldRefreshSize;
         node.xProperty().addListener(rs);
@@ -42,7 +41,7 @@ public AbstractVanillaListNodeSkinDelegate(N node) {
     }
 
     @Override
-    public void updateNarration(NarrationElementOutput narrationElementOutput) {
+    protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
     }
 
     public N getNode() {
@@ -130,15 +129,23 @@ protected void shouldChangeFocus() {
     }
 
     protected void refreshSize() {
-        width = node.getFullWidth();
-        height = node.getFullHeight();
-        x0 = node.getLeft();
-        x1 = node.getRight();
-        y0 = node.getTop();
-        y1 = node.getBottom();
+        width = node.getWidth();
+        height = node.getHeight();
+        setX(node.getX());
+        setY(node.getY());
         shouldRefreshSize = false;
     }
 
+    @Override
+    public int getRight() {
+        return node.getRight();
+    }
+
+    @Override
+    public int getBottom() {
+        return node.getBottom();
+    }
+
     protected void refreshList() {
         clearEntries();
         createList();
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
@@ -3,7 +3,6 @@
 import com.github.franckyi.guapi.api.node.CheckBox;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Checkbox;
@@ -15,7 +14,7 @@ public class VanillaCheckBoxSkinDelegate extends Checkbox implements VanillaWidg
     protected final CheckBox node;
 
     public VanillaCheckBoxSkinDelegate(CheckBox node) {
-        super(node.getX(), node.getY(), node.getWidth(), node.getHeight(), node.getLabel(), node.isChecked());
+        super(node.getX(), node.getY(), node.getLabel(), Minecraft.getInstance().font, node.isChecked(), (c, b) -> node.setChecked(b));
         this.node = node;
         initLabeledWidget(node);
         node.checkedProperty().addListener(this::onModelChange);
@@ -27,12 +26,6 @@ private void onModelChange() {
         }
     }
 
-    @Override
-    public void onPress() {
-        super.onPress();
-        node.setChecked(selected());
-    }
-
     @Override
     public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) {
         Minecraft mc = Minecraft.getInstance();
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaListViewSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaListViewSkinDelegate.java
@@ -2,7 +2,6 @@
 
 import com.github.franckyi.guapi.api.node.ListView;
 import com.github.franckyi.guapi.api.node.Node;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.GuiGraphics;
 
 public class VanillaListViewSkinDelegate<E> extends AbstractVanillaListNodeSkinDelegate<ListView<E>, E, VanillaListViewSkinDelegate.NodeEntry<E>> {
diff --git a/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTreeViewSkinDelegate.java b/common/src/main/java/com/github/franckyi/guapi/base/theme/vanilla/delegate/VanillaTreeViewSkinDelegate.java
@@ -3,7 +3,6 @@
 import com.github.franckyi.guapi.api.node.Node;
 import com.github.franckyi.guapi.api.node.TexturedButton;
 import com.github.franckyi.guapi.api.node.TreeView;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/controller/selection/color/TextColorSelectionScreenController.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/controller/selection/color/TextColorSelectionScreenController.java
@@ -5,7 +5,7 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.TextColor;
 
-import static com.github.franckyi.guapi.api.GuapiHelper.*;
+import static com.github.franckyi.guapi.api.GuapiHelper.text;
 
 public class TextColorSelectionScreenController extends ColorSelectionScreenController<TextColorSelectionScreenView> {
     public TextColorSelectionScreenController(ColorSelectionScreenModel model, TextColorSelectionScreenView view) {
@@ -17,8 +17,8 @@ protected void updateExample() {
         super.updateExample();
         var text = text("Test ")
                 .append(text("Test").withStyle(ChatFormatting.BOLD))
-                .append(text(" Test").withStyle(ChatFormatting.ITALIC))
-                .withStyle(style -> style.withColor(TextColor.parseColor(model.getHexValue())));
+                .append(text(" Test").withStyle(ChatFormatting.ITALIC));
+        TextColor.parseColor(model.getHexValue()).result().ifPresent(color -> text.withStyle(style -> style.withColor(color)));
         view.getExampleLabel().setLabel(text);
         view.getExampleLabel().getTooltip().setAll(text);
     }
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/category/item/ItemDisplayCategoryModel.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/category/item/ItemDisplayCategoryModel.java
@@ -11,7 +11,7 @@
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.contents.LiteralContents;
+import net.minecraft.network.chat.contents.PlainTextContents;
 import net.minecraft.world.item.ItemStack;
 
 public class ItemDisplayCategoryModel extends ItemEditorCategoryModel {
@@ -58,7 +58,7 @@ public void apply() {
         super.apply();
         if (!newLore.isEmpty()) {
             getOrCreateDisplay().put("Lore", newLore);
-        } else if (getOrCreateTag().contains("Lore")) {
+        } else if (getOrCreateDisplay().contains("Lore")) {
             getOrCreateDisplay().remove("Lore");
         }
         if (getDisplay().isEmpty()) {
@@ -73,7 +73,7 @@ private MutableComponent getItemName() {
 
     private void setItemName(MutableComponent value) {
         if (!value.getString().isEmpty()) {
-            if (!value.getSiblings().isEmpty() && value.getContents() instanceof LiteralContents lc && lc.text().isEmpty()) {
+            if (!value.getSiblings().isEmpty() && value.getContents() instanceof PlainTextContents lc && lc.text().isEmpty()) {
                 value.withStyle(style -> style.withItalic(false));
             }
             getOrCreateDisplay().putString(ItemStack.TAG_DISPLAY_NAME, Component.Serializer.toJson(value));
@@ -83,7 +83,7 @@ private void setItemName(MutableComponent value) {
     }
 
     private void addLore(MutableComponent value) {
-        if (!value.getString().isEmpty() && value.getContents() instanceof LiteralContents lc && lc.text().isEmpty() && !value.getSiblings().isEmpty()) {
+        if (!value.getString().isEmpty() && value.getContents() instanceof PlainTextContents lc && lc.text().isEmpty() && !value.getSiblings().isEmpty()) {
             value.withStyle(style -> style.withItalic(false).withColor(ChatFormatting.WHITE));
         }
         newLore.add(StringTag.valueOf(Component.Serializer.toJson(value)));
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/category/item/ItemHideFlagsCategoryModel.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/category/item/ItemHideFlagsCategoryModel.java
@@ -41,7 +41,7 @@ private void setFlag(HideFlag flag, boolean value) {
     }
 
     public enum HideFlag {
-        ENCHANTMENTS, ATTRIBUTE_MODIFIERS, UNBREAKABLE, CAN_DESTROY, CAN_PLACE_ON, OTHER, DYED;
+        ENCHANTMENTS, ATTRIBUTE_MODIFIERS, UNBREAKABLE, CAN_DESTROY, CAN_PLACE_ON, OTHER, DYED, ARMOR_TRIMS;
 
         public MutableComponent getName() {
             return ModTexts.gui(name().toLowerCase(Locale.ROOT));
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/util/texteditor/ColorFormatting.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/util/texteditor/ColorFormatting.java
@@ -23,7 +23,7 @@ public void setColor(String color) {
 
     @Override
     public void apply(MutableComponent text) {
-        text.withStyle(style -> style.withColor(TextColor.parseColor(color)));
+        TextColor.parseColor(color).result().ifPresent(color -> text.withStyle(style -> style.withColor(color)));
     }
 
     @Override
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/client/util/texteditor/TextEditorInputParser.java b/common/src/main/java/com/github/franckyi/ibeeditor/client/util/texteditor/TextEditorInputParser.java
@@ -1,7 +1,7 @@
 package com.github.franckyi.ibeeditor.client.util.texteditor;
 
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.contents.LiteralContents;
+import net.minecraft.network.chat.contents.PlainTextContents;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,7 +13,7 @@ public class TextEditorInputParser {
     private int index;
 
     public void parse(MutableComponent text) {
-        if (text.getContents() instanceof LiteralContents lc) {
+        if (text.getContents() instanceof PlainTextContents lc) {
             int length = lc.text().length();
             if (text.getStyle().isBold()) {
                 addStyleFormatting(new StyleFormatting(index, index + length, StyleType.BOLD));
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/common/ModTexts.java b/common/src/main/java/com/github/franckyi/ibeeditor/common/ModTexts.java
@@ -4,7 +4,8 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.TextColor;
 
-import static com.github.franckyi.guapi.api.GuapiHelper.*;
+import static com.github.franckyi.guapi.api.GuapiHelper.text;
+import static com.github.franckyi.guapi.api.GuapiHelper.translated;
 
 public final class ModTexts {
     public static final MutableComponent ADD = translated("ibeeditor.gui.add").withStyle(ChatFormatting.GREEN);
@@ -134,7 +135,9 @@ public static MutableComponent choose(MutableComponent with) {
     }
 
     public static MutableComponent addTag(String color, String with) {
-        return translated("ibeeditor.gui.add_tag", text(with)).withStyle(style -> style.withColor(TextColor.parseColor(color)));
+        var text = translated("ibeeditor.gui.add_tag", text(with));
+        TextColor.parseColor(color).result().ifPresent(c -> text.withStyle(style -> style.withColor(c)));
+        return text;
     }
 
     public static MutableComponent editorTitle(MutableComponent type) {
diff --git a/common/src/main/java/com/github/franckyi/ibeeditor/mixin/AbstractSelectionListMixin.java b/common/src/main/java/com/github/franckyi/ibeeditor/mixin/AbstractSelectionListMixin.java
@@ -15,9 +15,6 @@
 
 @Mixin(AbstractSelectionList.class)
 public abstract class AbstractSelectionListMixin<E> {
-    @Shadow
-    protected int y0;
-
     @Shadow
     protected int headerHeight;
 
@@ -45,7 +42,7 @@ private void getEntryAtPositionFix(double x, double y, CallbackInfoReturnable<E>
         ListNode<?> node = AbstractVanillaListNodeSkinDelegate.class.cast(this).getNode();
         int k = node.getLeft();
         int l = node.getRight();
-        int m = Mth.floor(y - (double) y0) - this.headerHeight + (int) getScrollAmount() - 4;
+        int m = Mth.floor(y - (double) node.getY()) - this.headerHeight + (int) getScrollAmount() - 4;
         int n = m / itemHeight;
         cir.setReturnValue(x < (double) getScrollbarPosition() && x >= (double) k && x <= (double) l && n >= 0 && m >= 0 && n < getItemCount() ? children().get(n) : null);
     }
diff --git a/common/src/main/resources/assets/ibeeditor/lang/en_us.json b/common/src/main/resources/assets/ibeeditor/lang/en_us.json
@@ -86,6 +86,7 @@
   "ibeeditor.gui.can_place_on": "Can Place On",
   "ibeeditor.gui.other": "Other",
   "ibeeditor.gui.dyed": "Dyed",
+  "ibeeditor.gui.armor_trims": "Armor Trims",
   "ibeeditor.gui.hide_other_tooltip.0": "Hides:",
   "ibeeditor.gui.hide_other_tooltip.1": "- Potion effects",
   "ibeeditor.gui.hide_other_tooltip.2": "- Shield pattern",
diff --git a/common/src/main/resources/ibeeditor.accesswidener b/common/src/main/resources/ibeeditor.accesswidener
@@ -0,0 +1,5 @@
+accessWidener v1 named
+
+mutable field net/minecraft/client/gui/components/MultilineTextField width I
+accessible method net/minecraft/client/gui/components/Checkbox <init> (IILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/Font;ZLnet/minecraft/client/gui/components/Checkbox$OnValueChange;)V
+extendable method net/minecraft/client/gui/components/AbstractWidget render (Lnet/minecraft/client/gui/GuiGraphics;IIF)V
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -62,6 +62,7 @@ jar {
 sourcesJar {
     def commonSources = project(":common").sourcesJar
     dependsOn commonSources
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from commonSources.archiveFile.map { zipTree(it) }
 }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -34,7 +34,7 @@
   "depends": {
     "fabricloader": ">=0.14",
     "fabric": "*",
-    "minecraft": ">=1.20.2",
+    "minecraft": ">=1.20.4",
     "java": ">=17"
   },
   "custom": {
diff --git a/fabric/src/main/resources/ibeeditor.accesswidener b/fabric/src/main/resources/ibeeditor.accesswidener
@@ -1,3 +1,5 @@
 accessWidener v1 named
 
-mutable field net/minecraft/client/gui/components/MultilineTextField width I
+mutable field net/minecraft/client/gui/components/MultilineTextField width I
+accessible method net/minecraft/client/gui/components/Checkbox <init> (IILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/Font;ZLnet/minecraft/client/gui/components/Checkbox$OnValueChange;)V
+extendable method net/minecraft/client/gui/components/AbstractWidget render (Lnet/minecraft/client/gui/GuiGraphics;IIF)V
diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
@@ -1 +1,3 @@
-public-f net.minecraft.client.gui.components.MultilineTextField f_238603_ # width
+public-f net.minecraft.client.gui.components.MultilineTextField f_238603_ # width
+public net.minecraft.client.gui.components.Checkbox <init>(IILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/Font;ZLnet/minecraft/client/gui/components/Checkbox$OnValueChange;)V
+public-f net.minecraft.client.gui.components.AbstractWidget m_88315_(Lnet/minecraft/client/gui/GuiGraphics;IIF)V # render
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[48,)"
+loaderVersion = "[49,)"
 license = "MIT"
 issueTrackerURL = "https://github.com/skyecodes/IBE-Editor/issues"
 logoFile = "logo.png"
@@ -17,13 +17,13 @@ description = "Simple GUI Mod to edit an item, a block or an entity in your curr
 [[dependencies.ibeeditor]]
 modId = "forge"
 mandatory = true
-versionRange = "[48,)"
+versionRange = "[49,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.ibeeditor]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.2,)"
+versionRange = "[1.20.4,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/forge_update.json b/forge_update.json
@@ -6,6 +6,8 @@
     "1.20.1-latest": "2.2.3",
     "1.20.1-recommended": "2.2.3",
     "1.20.2-latest": "2.2.6",
-    "1.20.2-recommended": "2.2.6"
+    "1.20.2-recommended": "2.2.6",
+    "1.20.4-latest": "2.2.7",
+    "1.20.4-recommended": "2.2.7"
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,19 +2,19 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 # IBE Editor
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 archives_base_name=IBEEditor
-mod_version=2.2.6
+mod_version=2.2.7
 maven_group=com.github.franckyi.ibeeditor
 # Fabric https://fabricmc.net/develop/
-fabric_loader_version=0.14.24
-fabric_api_version=0.90.7+1.20.2
-modmenu_version=8.0.0
+fabric_loader_version=0.15.2
+fabric_api_version=0.91.2+1.20.4
+modmenu_version=9.0.0-pre.1
 # Forge https://files.minecraftforge.net/
-forge_version=48.0.40
+forge_version=49.0.9
 # NeoForge https://neoforged.net/
-neoforge_version=20.2.62-beta
+neoforge_version=20.4.24-beta
 # Build and release info
 java_version=17
-major_minecraft_version=1.20.2
-compatible_minecraft_versions=["1.20.2"]
+major_minecraft_version=1.20.4
+compatible_minecraft_versions=["1.20.4"]
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg
@@ -1 +1,3 @@
-public-f net.minecraft.client.gui.components.MultilineTextField f_238603_ # width
+public-f net.minecraft.client.gui.components.MultilineTextField width
+public net.minecraft.client.gui.components.Checkbox <init>(IILnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/Font;ZLnet/minecraft/client/gui/components/Checkbox$OnValueChange;)V
+public-f net.minecraft.client.gui.components.AbstractWidget render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
diff --git a/versions.json b/versions.json

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private void setFlag(HideFlag flag, boolean value) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public enum HideFlag {`
`44`		`- ENCHANTMENTS, ATTRIBUTE_MODIFIERS, UNBREAKABLE, CAN_DESTROY, CAN_PLACE_ON, OTHER, DYED;`
	`44`	`+ ENCHANTMENTS, ATTRIBUTE_MODIFIERS, UNBREAKABLE, CAN_DESTROY, CAN_PLACE_ON, OTHER, DYED, ARMOR_TRIMS;`
`45`	`45`
`46`	`46`	`public MutableComponent getName() {`
`47`	`47`	`return ModTexts.gui(name().toLowerCase(Locale.ROOT));`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void setColor(String color) {`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public void apply(MutableComponent text) {`
`26`		`- text.withStyle(style -> style.withColor(TextColor.parseColor(color)));`
	`26`	`+ TextColor.parseColor(color).result().ifPresent(color -> text.withStyle(style -> style.withColor(color)));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ jar {`
`62`	`62`	`sourcesJar {`
`63`	`63`	`def commonSources = project(":common").sourcesJar`
`64`	`64`	`dependsOn commonSources`
	`65`	`+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`65`	`66`	`from commonSources.archiveFile.map { zipTree(it) }`
`66`	`67`	`}`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`"1.20.1-latest": "2.2.3",`
`7`	`7`	`"1.20.1-recommended": "2.2.3",`
`8`	`8`	`"1.20.2-latest": "2.2.6",`
`9`		`- "1.20.2-recommended": "2.2.6"`
	`9`	`+ "1.20.2-recommended": "2.2.6",`
	`10`	`+ "1.20.4-latest": "2.2.7",`
	`11`	`+ "1.20.4-recommended": "2.2.7"`
`10`	`12`	`}`
`11`	`13`	`}`