From b79cd15ce15c96be575b09a243c44e9b14f0a5e4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 28 Mar 2026 01:03:34 +0100 Subject: Update to 26.1 (#545) * Start porting to 26.1 Update to Gradle 9 * Delete AdvancedImageButton, AdvancedTooltip, AdvancedWidgetTooltipHolder * MixinJoinMultiplayerScreen: Replace AdvancedImageButton * MixinPlayerEntry: Replace AdvancedImageButton * MixinChatScreen: Replace AdvancedImageButton * Fix class tweaker * Update github workflows * Delete SwitchableSprites * Update ModMenu version to 18.0.0-alpha.8 * Update Mixin Java compatibility levels to Java 25 --------- Co-authored-by: Aizistral --- src/main/resources/fabric.mod.json | 8 ++--- .../mixins/common/nochatreports.mixins.json | 2 +- .../mixins/fabric/nochatreports-fabric.mixins.json | 2 +- src/main/resources/nochatreports.accesswidener | 35 ---------------------- src/main/resources/nochatreports.classtweaker | 35 ++++++++++++++++++++++ 5 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 src/main/resources/nochatreports.accesswidener create mode 100644 src/main/resources/nochatreports.classtweaker (limited to 'src/main/resources') diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6762cd9..0e54d36 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,13 +38,13 @@ ], "depends": { - "fabricloader": ">=0.17.2", + "fabricloader": ">=0.18.4", "fabric-api": "*", - "minecraft": [ ">=1.21.9" ], - "java": ">=21" + "minecraft": [ ">=26.1" ], + "java": ">=25" }, "suggests": {}, - "accessWidener" : "nochatreports.accesswidener", + "accessWidener" : "nochatreports.classtweaker", "custom": { "modmenu": { diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index ae05247..0261dd3 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.common.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [ "common.MixinJsonByteBufCodec", "server.MixinServerboundChatPacket", diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json index 799993a..db47bc6 100644 --- a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json +++ b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.fabric.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [ ], "client": [ diff --git a/src/main/resources/nochatreports.accesswidener b/src/main/resources/nochatreports.accesswidener deleted file mode 100644 index 63889da..0000000 --- a/src/main/resources/nochatreports.accesswidener +++ /dev/null @@ -1,35 +0,0 @@ -accessWidener v1 named -accessible field net/minecraft/client/gui/screens/options/OptionsSubScreen list Lnet/minecraft/client/gui/components/OptionsList; -accessible field net/minecraft/network/chat/contents/TranslatableContents args [Ljava/lang/Object; -mutable field net/minecraft/network/chat/contents/TranslatableContents args [Ljava/lang/Object; -accessible field net/minecraft/network/chat/MutableComponent contents Lnet/minecraft/network/chat/ComponentContents; -mutable field net/minecraft/network/chat/MutableComponent contents Lnet/minecraft/network/chat/ComponentContents; -#accessible field net/minecraft/client/gui/screens/multiplayer/WarningScreen message Lnet/minecraft/client/gui/components/MultiLineLabel; -accessible field net/minecraft/client/multiplayer/ClientPacketListener signedMessageEncoder Lnet/minecraft/network/chat/SignedMessageChain$Encoder; -accessible field net/minecraft/client/multiplayer/ClientPacketListener chatSession Lnet/minecraft/network/chat/LocalChatSession; -accessible method net/minecraft/client/gui/components/Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V -accessible field net/minecraft/client/gui/components/Tooltip MAX_WIDTH I -accessible field net/minecraft/client/gui/components/Tooltip message Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/client/gui/components/Tooltip narration Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/client/gui/components/Tooltip cachedTooltip Ljava/util/List; -accessible field net/minecraft/client/gui/screens/Screen minecraft Lnet/minecraft/client/Minecraft; -accessible field net/minecraft/client/gui/screens/Screen font Lnet/minecraft/client/gui/Font; -#accessible field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/Tooltip; -#accessible field net/minecraft/client/gui/components/AbstractWidget tooltipMsDelay I -#accessible method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V -#extendable method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V -accessible field net/minecraft/client/gui/screens/options/OptionsScreen TELEMETRY Lnet/minecraft/network/chat/Component; - -accessible method net/minecraft/client/gui/components/AbstractWidget render (Lnet/minecraft/client/gui/GuiGraphics;IIF)V -extendable method net/minecraft/client/gui/components/AbstractWidget render (Lnet/minecraft/client/gui/GuiGraphics;IIF)V - -#accessible method net/minecraft/client/gui/components/Tooltip createTooltipPositioner (ZZLnet/minecraft/client/gui/navigation/ScreenRectangle;)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; -#extendable method net/minecraft/client/gui/components/Tooltip createTooltipPositioner (ZZLnet/minecraft/client/gui/navigation/ScreenRectangle;)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; - -accessible field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/WidgetTooltipHolder; -mutable field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/WidgetTooltipHolder; - -accessible method net/minecraft/client/gui/components/WidgetTooltipHolder createTooltipPositioner (Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; -extendable method net/minecraft/client/gui/components/WidgetTooltipHolder createTooltipPositioner (Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; - -accessible method net/minecraft/client/multiplayer/ClientPacketListener setKeyPair (Lnet/minecraft/world/entity/player/ProfileKeyPair;)V \ No newline at end of file diff --git a/src/main/resources/nochatreports.classtweaker b/src/main/resources/nochatreports.classtweaker new file mode 100644 index 0000000..2c9e18e --- /dev/null +++ b/src/main/resources/nochatreports.classtweaker @@ -0,0 +1,35 @@ +classTweaker v1 official +accessible field net/minecraft/client/gui/screens/options/OptionsSubScreen list Lnet/minecraft/client/gui/components/OptionsList; +accessible field net/minecraft/network/chat/contents/TranslatableContents args [Ljava/lang/Object; +mutable field net/minecraft/network/chat/contents/TranslatableContents args [Ljava/lang/Object; +accessible field net/minecraft/network/chat/MutableComponent contents Lnet/minecraft/network/chat/ComponentContents; +mutable field net/minecraft/network/chat/MutableComponent contents Lnet/minecraft/network/chat/ComponentContents; +#accessible field net/minecraft/client/gui/screens/multiplayer/WarningScreen message Lnet/minecraft/client/gui/components/MultiLineLabel; +accessible field net/minecraft/client/multiplayer/ClientPacketListener signedMessageEncoder Lnet/minecraft/network/chat/SignedMessageChain$Encoder; +accessible field net/minecraft/client/multiplayer/ClientPacketListener chatSession Lnet/minecraft/network/chat/LocalChatSession; +#accessible method net/minecraft/client/gui/components/Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V +accessible field net/minecraft/client/gui/components/Tooltip MAX_WIDTH I +accessible field net/minecraft/client/gui/components/Tooltip message Lnet/minecraft/network/chat/Component; +accessible field net/minecraft/client/gui/components/Tooltip narration Lnet/minecraft/network/chat/Component; +accessible field net/minecraft/client/gui/components/Tooltip cachedTooltip Ljava/util/List; +accessible field net/minecraft/client/gui/screens/Screen minecraft Lnet/minecraft/client/Minecraft; +accessible field net/minecraft/client/gui/screens/Screen font Lnet/minecraft/client/gui/Font; +#accessible field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/Tooltip; +#accessible field net/minecraft/client/gui/components/AbstractWidget tooltipMsDelay I +#accessible method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V +#extendable method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V +accessible field net/minecraft/client/gui/screens/options/OptionsScreen TELEMETRY Lnet/minecraft/network/chat/Component; + +#accessible method net/minecraft/client/gui/components/AbstractWidget render (Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V +#extendable method net/minecraft/client/gui/components/AbstractWidget render (Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V + +#accessible method net/minecraft/client/gui/components/Tooltip createTooltipPositioner (ZZLnet/minecraft/client/gui/navigation/ScreenRectangle;)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; +#extendable method net/minecraft/client/gui/components/Tooltip createTooltipPositioner (ZZLnet/minecraft/client/gui/navigation/ScreenRectangle;)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; + +accessible field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/WidgetTooltipHolder; +mutable field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/WidgetTooltipHolder; + +accessible method net/minecraft/client/gui/components/WidgetTooltipHolder createTooltipPositioner (Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; +extendable method net/minecraft/client/gui/components/WidgetTooltipHolder createTooltipPositioner (Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; + +accessible method net/minecraft/client/multiplayer/ClientPacketListener setKeyPair (Lnet/minecraft/world/entity/player/ProfileKeyPair;)V \ No newline at end of file -- cgit v1.2.3