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 --- .github/workflows/build.yml | 12 +- build.gradle | 35 ++--- common.gradle | 0 forge/build.gradle | 93 +++++-------- .../main/resources/META-INF/accesstransformer.cfg | 46 +++--- .../mixins/forge/nochatreports-forge.mixins.json | 2 +- gradle.properties | 24 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 29 ++-- .../neoforge/nochatreports-neoforge.mixins.json | 2 +- settings.gradle | 3 +- .../common/config/ClothConfigIntegration.java | 1 - .../common/config/NCRConfigClient.java | 8 +- .../nochatreports/common/core/SigningMode.java | 12 -- .../common/gui/AdvancedImageButton.java | 58 -------- .../nochatreports/common/gui/AdvancedTooltip.java | 117 ---------------- .../common/gui/AdvancedWidgetTooltipHolder.java | 36 ----- .../nochatreports/common/gui/InvisibleButton.java | 4 +- .../common/gui/SwitchableSprites.java | 53 ------- .../common/mixins/client/MixinChatScreen.java | 154 +++++++++------------ .../common/mixins/client/MixinGuiMessageTag.java | 2 +- .../mixins/client/MixinJoinMultiplayerScreen.java | 55 ++++---- .../mixins/client/MixinOnlineServerEntry.java | 12 +- .../common/mixins/client/MixinPlayerEntry.java | 7 +- .../common/mixins/client/MixinTitleScreen.java | 2 +- 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 +++++ 30 files changed, 257 insertions(+), 594 deletions(-) delete mode 100644 common.gradle delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java delete mode 100644 src/main/resources/nochatreports.accesswidener create mode 100644 src/main/resources/nochatreports.classtweaker diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0693f02..355a1af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,16 +10,16 @@ jobs: build: strategy: matrix: - java: [ 21 ] + java: [ 25 ] os: [ubuntu-22.04, windows-2022] runs-on: ${{ matrix.os }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/actions/wrapper-validation@v5 - name: Setup JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -29,11 +29,11 @@ jobs: - name: Build the mod run: ./gradlew build - name: Upload build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts from one OS and required JDK. + if: ${{ runner.os == 'Linux' && matrix.java == '25' }} # Only upload artifacts from one OS and required JDK. uses: actions/upload-artifact@v4 with: name: Artifacts path: | build/libs/ forge/build/libs/ - neoforge/build/libs/ \ No newline at end of file + neoforge/build/libs/ diff --git a/build.gradle b/build.gradle index 831a81b..43e4b36 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,10 @@ import org.apache.tools.ant.taskdefs.condition.Os import java.nio.file.* plugins { - id 'fabric-loom' version "${loom_version}" + id "net.fabricmc.fabric-loom" version "${loom_version}" id 'maven-publish' id "com.modrinth.minotaur" version "2.+" - id "com.matthewprenger.cursegradle" version "1.+" + id "de.maxhenkel.cursegradle" version "1.+" } version = project.mod_version @@ -15,8 +15,6 @@ base { archivesName = project.archives_base_name } -apply from: 'common.gradle' - def createLink(String source, String target) { def sourceFile = file(source).toPath().toAbsolutePath() def targetFile = file(target).toPath().toAbsolutePath() @@ -53,10 +51,6 @@ def setupLinks() { setupLinks() -tasks.withType(JavaCompile).configureEach { - it.options.release = 21 -} - java { // withSourcesJar() @@ -65,7 +59,7 @@ java { } loom { - accessWidenerPath = file("src/main/resources/nochatreports.accesswidener") + accessWidenerPath = file("src/main/resources/nochatreports.classtweaker") mixin { add(sourceSets.main, "nochatreports.refmap.json") @@ -76,16 +70,15 @@ repositories { maven { url "https://maven.shedaniel.me/" } maven { url "https://maven.terraformersmc.com/releases/" } maven { url 'https://jitpack.io' } - maven { url "file:///${project.projectDir}/deps/" } + maven { url file("deps") } } dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}" - modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { + implementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "com.terraformersmc:modmenu:${project.mod_menu_version}" + api("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } } @@ -117,7 +110,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 25 } java { @@ -152,11 +145,11 @@ curseforge { releaseType = "${version_type}" changelogType = 'markdown' changelog = file('docs/CHANGELOG.md') - mainArtifact(remapJar) + mainArtifact(jar) addGameVersion project.minecraft_version addGameVersion 'Fabric' - addGameVersion 'Java 21' + addGameVersion 'Java 25' relations { requiredDependency 'fabric-api' @@ -165,7 +158,7 @@ curseforge { } afterEvaluate { - uploadTask.dependsOn(remapJar) + uploadTask.dependsOn(jar) } //debug = true @@ -185,7 +178,7 @@ modrinth { versionName = "No Chat Reports Fabric-" + project.mod_version versionType = "${version_type}" changelog = rootProject.file("docs/CHANGELOG.md").text - uploadFile = remapJar + uploadFile = jar gameVersions = [ project.minecraft_version ] loaders = ['fabric'] @@ -202,7 +195,7 @@ modrinth { tasks.modrinth.dependsOn(tasks.modrinthSyncBody) afterEvaluate { - upload.dependsOn(remapJar) + upload.dependsOn(jar) } task upload { diff --git a/common.gradle b/common.gradle deleted file mode 100644 index e69de29..0000000 diff --git a/forge/build.gradle b/forge/build.gradle index afa5688..1b7e7ab 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { mavenCentral() - maven { url "file:///${project.projectDir}/deps/" } + maven { url file("deps") } maven { url = 'https://maven.minecraftforge.net' } maven { url = 'https://dist.creeper.host/Sponge/maven' } maven { url 'https://plugins.gradle.org/m2/' } @@ -12,34 +12,22 @@ buildscript { maven { name "Gradle Plugin Portal" url 'https://plugins.gradle.org/m2/' - content { - includeGroup "gradle.plugin.com.matthewprenger" + content { includeGroup "com.modrinth" } } } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.36,6.2)' - classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' - classpath 'org.spongepowered:mixingradle:0.7.+' - } } plugins { + id 'java' + id 'idea' + id 'eclipse' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '[7.0.17,8.0)' id "com.modrinth.minotaur" version "2.+" } -println("Applying plugins...") - -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.spongepowered.mixin' -apply plugin: 'eclipse' -apply plugin: 'idea' -apply plugin: 'maven-publish' -apply plugin: 'com.matthewprenger.cursegradle' - -apply from: '../common.gradle' - println("Specifying project version/group/archivesBaseName...") version = "${mod_version}" group = "${maven_group}" @@ -49,7 +37,7 @@ base { } println("Specifying Java compatibility...") -java.toolchain.languageVersion = JavaLanguageVersion.of(21) +java.toolchain.languageVersion = JavaLanguageVersion.of(25) println("Java Installation Data:") println(" - Java Version: " + System.getProperty('java.version')) @@ -59,47 +47,30 @@ println(" - OS Archetype: " + System.getProperty('os.arch')) compileJava.options.encoding = "UTF-8" -mixin { - println("Specifying refmaps for Mixin...") - add sourceSets.main, "nochatreports.refmap.json" - config "mixins/common/nochatreports.mixins.json" - config "mixins/forge/nochatreports-forge.mixins.json" - defaultObfuscationEnv "searge" -} - minecraft { - println("Specifying MCP mappings...") mappings channel: 'official', version: minecraft_version - - println("Specifying Access Transformer configuration...") - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - reobf = false - copyIdeResources = true - - runs { - configureEach { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' + + accessTransformers = files('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + configureEach { + workingDir.convention layout.projectDirectory.dir('run') + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' + args "--mixin.config=mixins/common/nochatreports.mixins.json" + args "--mixin.config=mixins/forge/nochatreports-forge.mixins.json" } - - client { - properties 'org.gradle.jvmargs': '-Xms4G -Xmx4G' - properties 'fml.earlyprogresswindow': 'false' - properties 'mixin.env.disableRefMap': 'true' - - property 'forge.enabledGameTestNamespaces', mod_id - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' + register('client') { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + systemProperty 'forge.logging.console.level', 'debug' } - server { - properties 'mixin.env.disableRefMap': 'true' - property 'forge.enabledGameTestNamespaces', mod_id - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' + register('server') { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + systemProperty 'forge.logging.console.level', 'debug' args '--nogui' } } @@ -110,23 +81,23 @@ sourceSets.main.resources { } repositories { - println("Specifying repositories...") - maven { url "file:///${project.projectDir}/deps/" } // local + println("Specifying repositories...") + maven { url file("deps") } // local maven { url = "https://maven.theillusivec4.top/" } // curios maven { url = "https://maven.blamejared.com/" } // patchouli maven { url = "https://repo.spongepowered.org/maven" } // mixin maven { url "https://maven.shedaniel.me/" } // cloth config + minecraft.mavenizer(it) // minecraft } dependencies { println("Processing dependencies...") // Minecraft & Forge - minecraft "net.minecraftforge:forge:${forge_version}" + implementation minecraft.dependency("net.minecraftforge:forge:$minecraft_version-$forge_version") implementation "generic:modmenu:5.0.2" implementation "generic:fabric-annotations:v1.0.0" implementation "generic:cloth-config-api:14.0.126" - annotationProcessor "org.spongepowered:mixin:0.8.5:processor" // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+ implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } } @@ -198,7 +169,7 @@ curseforge { changelog = rootProject.file('docs/CHANGELOG.md') addGameVersion project.minecraft_version - addGameVersion "Java 21" + addGameVersion "Java 25" addGameVersion "Forge" //addArtifact(sourcesJar) @@ -247,7 +218,7 @@ publishing { } repositories { maven { - url "file:///${project.projectDir}/mcmodsrepo" + url file("mcmodsrepo") } } } diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg index c923a04..4fd2634 100644 --- a/forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/forge/src/main/resources/META-INF/accesstransformer.cfg @@ -1,26 +1,26 @@ -public net.minecraft.client.gui.screens.options.OptionsSubScreen f_337426_ #list -public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents -public-f net.minecraft.network.chat.contents.TranslatableContents f_237498_ #args -public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents -public net.minecraft.client.gui.screens.multiplayer.WarningScreen f_210915_ #message -public net.minecraft.client.multiplayer.ClientPacketListener f_240902_ #signedMessageEncoder -public net.minecraft.client.multiplayer.ClientPacketListener f_252517_ #chatSession -public net.minecraft.client.gui.components.Tooltip f_257026_ #MAX_WIDTH -public net.minecraft.client.gui.components.Tooltip f_256850_ #message -public net.minecraft.client.gui.components.Tooltip f_257004_ #narration -public net.minecraft.client.gui.components.Tooltip f_256766_ #cachedTooltip -public net.minecraft.client.gui.screens.Screen f_96541_ #minecraft -public net.minecraft.client.gui.screens.Screen f_96542_ #itemRenderer -public net.minecraft.client.gui.screens.Screen f_96547_ #font -public-f net.minecraft.client.gui.components.AbstractWidget f_256816_ #tooltip -#public net.minecraft.client.gui.components.AbstractWidget f_256936_ #tooltipMsDelay -public net.minecraft.client.gui.screens.options.OptionsScreen f_337656_ #TELEMETRY +public net.minecraft.client.gui.screens.options.OptionsSubScreen list +public-f net.minecraft.network.chat.MutableComponent contents +public-f net.minecraft.network.chat.contents.TranslatableContents args +public-f net.minecraft.network.chat.MutableComponent contents +public net.minecraft.client.gui.screens.multiplayer.WarningScreen message +public net.minecraft.client.multiplayer.ClientPacketListener signedMessageEncoder +public net.minecraft.client.multiplayer.ClientPacketListener chatSession +public net.minecraft.client.gui.components.Tooltip MAX_WIDTH +public net.minecraft.client.gui.components.Tooltip message +public net.minecraft.client.gui.components.Tooltip narration +public net.minecraft.client.gui.components.Tooltip cachedTooltip +public net.minecraft.client.gui.screens.Screen minecraft +public net.minecraft.client.gui.screens.Screen itemRenderer +public net.minecraft.client.gui.screens.Screen font +public-f net.minecraft.client.gui.components.AbstractWidget tooltip +#public net.minecraft.client.gui.components.AbstractWidget tooltipMsDelay +public net.minecraft.client.gui.screens.options.OptionsScreen TELEMETRY -public net.minecraft.client.gui.components.Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V # -#public-f net.minecraft.client.gui.components.AbstractWidget m_257936_()V #updateTooltip -#public-f net.minecraft.client.gui.components.CycleButton m_257795_()V #updateTooltip +public net.minecraft.client.gui.components.Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V +#public-f net.minecraft.client.gui.components.AbstractWidget updateTooltip()V +#public-f net.minecraft.client.gui.components.CycleButton updateTooltip()V -public-f net.minecraft.client.gui.components.AbstractWidget m_88315_(Lnet/minecraft/client/gui/GuiGraphics;IIF)V #render -public net.minecraft.client.gui.components.WidgetTooltipHolder m_323619_(Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; #createTooltipPositioner +public-f net.minecraft.client.gui.components.AbstractWidget render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V +public net.minecraft.client.gui.components.WidgetTooltipHolder createTooltipPositioner(Lnet/minecraft/client/gui/navigation/ScreenRectangle;ZZ)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner; -public net.minecraft.client.multiplayer.ClientPacketListener m_260951_(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V #setKeyPair \ No newline at end of file +public net.minecraft.client.multiplayer.ClientPacketListener setKeyPair(Lnet/minecraft/world/entity/player/ProfileKeyPair;)V \ No newline at end of file diff --git a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json index 6c5e73e..7d16556 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [], "client": [ "client.MixinClientConnection", diff --git a/gradle.properties b/gradle.properties index 29e3204..39c88de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false # Toolchain Properties -minecraft_version=1.21.11 -fabric_loader_version=0.18.2 -loom_version=1.13-SNAPSHOT -forge_version=1.21.11-61.0.3 -neoforge_version=21.11.8-beta +minecraft_version=26.1 +fabric_loader_version=0.18.4 +loom_version=1.15-SNAPSHOT +forge_version=62.0.2 +neoforge_version=26.1.0.1-beta # Mod Properties -mod_version=1.21.11-v2.18.0 +mod_version=26.1-v2.19.0 maven_group=com.aizistral.nochatreports archives_base_name=NoChatReports-FABRIC mod_id=nochatreports @@ -23,14 +23,14 @@ mod_icon=assets/nochatreports/textures/misc/ncr_logo.png mod_license=WTFPL # Dependencies -fabric_version=0.139.5+1.21.11 -mod_menu_version=17.0.0-alpha.1 -cloth_config_version=21.11.150 +fabric_version=0.144.3+26.1 +mod_menu_version=18.0.0-alpha.8 +cloth_config_version=26.1.154 # Dependencies in mods.toml -dep_forge=[61,) -dep_neoforge=[21.11.0-beta,) -dep_minecraft=[1.21.11,) +dep_forge=[62,) +dep_neoforge=[26.1.0.1-beta,) +dep_minecraft=[26.1,) # Publishing curse_id=634062 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..c61a118 100644 --- 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-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 1093d7c..8b67d27 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,39 +1,28 @@ buildscript { repositories { mavenCentral() - maven { url "file:///${project.projectDir}/deps/" } + maven { url file("deps") } maven { url 'https://plugins.gradle.org/m2/' } maven { name "Gradle Plugin Portal" url 'https://plugins.gradle.org/m2/' - content { - includeGroup "gradle.plugin.com.matthewprenger" + content { includeGroup "com.modrinth" } } } - dependencies { - classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' - } } plugins { id 'java-library' id 'eclipse' id 'idea' + id 'maven-publish' id "com.modrinth.minotaur" version "2.+" - id 'net.neoforged.gradle.userdev' version '7.0.183' + id "de.maxhenkel.cursegradle" version "1.+" + id 'net.neoforged.gradle.userdev' version '7.1.21' } -println("Applying plugins...") - -apply plugin: 'eclipse' -apply plugin: 'idea' -apply plugin: 'maven-publish' -apply plugin: 'com.matthewprenger.cursegradle' - -apply from: '../common.gradle' - println("Specifying project version/group/archivesBaseName...") version = "${mod_version}" group = "${maven_group}" @@ -43,7 +32,7 @@ base { } println("Specifying Java compatibility...") -java.toolchain.languageVersion = JavaLanguageVersion.of(21) +java.toolchain.languageVersion = JavaLanguageVersion.of(25) println("Java Installation Data:") println(" - Java Version: " + System.getProperty('java.version')) @@ -91,7 +80,7 @@ configurations { repositories { println("Specifying repositories...") - maven { url "file:///${project.projectDir}/deps/" } // local + maven { url file("deps") } // local maven { url = "https://maven.theillusivec4.top/" } // curios maven { url = "https://maven.blamejared.com/" } // patchouli maven { url = "https://repo.spongepowered.org/maven" } // mixin @@ -173,7 +162,7 @@ curseforge { changelog = rootProject.file('docs/CHANGELOG.md') addGameVersion project.minecraft_version - addGameVersion "Java 21" + addGameVersion "Java 25" addGameVersion "NeoForge" //addArtifact(sourcesJar) @@ -231,7 +220,7 @@ publishing { } repositories { maven { - url "file:///${project.projectDir}/mcmodsrepo" + url file("mcmodsrepo") } } } \ No newline at end of file diff --git a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json index 67906d1..1da9702 100644 --- a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json +++ b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.neoforge.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [], "client": [ "client.MixinClientConnection", diff --git a/settings.gradle b/settings.gradle index 2c91fb0..bda5832 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,8 @@ pluginManagement { name = 'Fabric' url = 'https://maven.fabricmc.net/' } - maven { url = 'https://maven.neoforged.net' } + maven { url = 'https://maven.neoforged.net/releases' } + maven { url = 'https://maven.maxhenkel.de/repository/public' } mavenCentral() gradlePluginPortal() } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java index 4d4ee53..af765db 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java @@ -266,5 +266,4 @@ public final class ClothConfigIntegration { return builder.build(); } } - } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java index 30db481..7856669 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java @@ -26,10 +26,6 @@ public final class NCRConfigClient extends JSONConfig { return new NCRConfigClient(); } - public void toggleMod() { - this.enableMod = !this.enableMod; - } - /** * @return True if client with No Chat Reports installed should demand that mod is present on * every server that it tries to join. In that case client will not be able to join servers that @@ -180,6 +176,10 @@ public final class NCRConfigClient extends JSONConfig { return this.enableMod; } + public void setEnableMod(boolean enableMod) { + this.enableMod = enableMod; + } + /** * @return Whether warning on entering Realms screen should not be displayed. */ diff --git a/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java index 51e3d91..3668c7d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java @@ -70,18 +70,6 @@ public enum SigningMode { return Component.translatable(this.getTooltipKey()); } - public SigningMode next() { - SigningMode result = null; - - if (this.ordinal() == values().length - 1) { - result = values()[0]; - } else { - result = values()[this.ordinal() + 1]; - } - - return result.isSelectable() ? result : result.next(); - } - public SigningMode resolve() { return switch(this) { case DEFAULT -> NCRConfig.getClient().defaultSigningMode(); diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java deleted file mode 100644 index 704739e..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.ImageButton; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; - -@Environment(EnvType.CLIENT) -public class AdvancedImageButton extends ImageButton { - protected final Screen parent; - protected final SwitchableSprites switchable; - - public AdvancedImageButton(int x, int y, int xSize, int ySize, SwitchableSprites sprites, OnPress onPress, - Component name, Screen parent) { - super(x, y, xSize, ySize, sprites.getDefault(), onPress, name); - - this.parent = parent; - this.switchable = sprites; - } - - public void useSprites(int index) { - this.switchable.setIndex(index); - } - - public int getSpritesIndex() { - return this.switchable.getIndex(); - } - - public Identifier getCurrentTexture() { - return this.switchable.getCurrent().get(this.isActive(), this.isHoveredOrFocused()); - } - - @Override - public void renderContents(GuiGraphics graphics, int mouseX, int mouseY, float delta) { - graphics.blitSprite(RenderPipelines.GUI_TEXTURED, this.getCurrentTexture(), this.getX(), this.getY(), this.width, this.height); - - if (this.isHovered) - if (this.tooltip instanceof AdvancedWidgetTooltipHolder holder && holder.hasCustomRender()) { - holder.doCustomRender(this.parent, graphics, mouseX, mouseY, holder.createTooltipPositioner( - this.getRectangle(), this.isHovered(), this.isFocused())); - } - } - - @Override - public void setTooltip(Tooltip tooltip) { - if (tooltip instanceof AdvancedTooltip) { - this.tooltip = new AdvancedWidgetTooltipHolder(); - } - - super.setTooltip(tooltip); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java deleted file mode 100644 index 17e1523..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; -import net.minecraft.network.chat.Component; -import net.minecraft.util.FormattedCharSequence; -import org.jetbrains.annotations.Nullable; -import org.joml.Vector2ic; - -import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -@Environment(EnvType.CLIENT) -public class AdvancedTooltip extends Tooltip { - @Nullable - protected Supplier supplier; - protected int maxWidth = MAX_WIDTH; - protected boolean renderWithoutGap = false; - - public AdvancedTooltip(Component message, @Nullable Component narration) { - super(message, narration); - } - - public AdvancedTooltip(Component message) { - this(message, message); - } - - public AdvancedTooltip(Supplier message) { - this(message.get()); - this.supplier = message; - } - - public AdvancedTooltip setMaxWidth(int maxWidth) { - this.maxWidth = maxWidth; - return this; - } - - public AdvancedTooltip setRenderWithoutGap(boolean render) { - this.renderWithoutGap = render; - return this; - } - - public Component getMessage() { - return this.supplier != null ? this.supplier.get() : this.message; - } - - @Override - public List toCharSequence(Minecraft minecraft) { - if (this.supplier == null) { - if (this.cachedTooltip == null) { - this.cachedTooltip = splitTooltip(minecraft, this.getMessage(), this.maxWidth); - } - return this.cachedTooltip; - } else - return splitTooltip(minecraft, this.getMessage(), this.maxWidth); - } - - public boolean hasCustomRender() { - return this.renderWithoutGap; - } - - public static List splitTooltip(Minecraft minecraft, Component component, int maxWidth) { - return minecraft.font.split(component, maxWidth); - } - - public void doCustomRender(Screen screen, GuiGraphics graphics, int x, int y, ClientTooltipPositioner positioner) { - if (this.renderWithoutGap) { - this.renderTooltipNoGap(screen, graphics, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), this.getMessage(), x, y, positioner); - } else - throw new UnsupportedOperationException("This tooltip doesn't support custom render!"); - } - - protected void renderTooltipNoGap(Screen screen, GuiGraphics poseStack, List list, Component component, int x, int y, ClientTooltipPositioner positioner) { - this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), component, x, y, positioner); - } - - // Originates from GuiGraphics - protected void renderTooltipInternalNoGap(Screen screen, GuiGraphics graphics, List list, Component component, int i, int j, ClientTooltipPositioner clientTooltipPositioner) { - ClientTooltipComponent clientTooltipComponent2; - int t; - if (list.isEmpty()) - return; - int k = 0; - int l = list.size() == 1 ? -2 : /*0*/ -2; - for (ClientTooltipComponent clientTooltipComponent : list) { - int m = clientTooltipComponent.getWidth(screen.font); - if (m > k) { - k = m; - } - l += clientTooltipComponent.getHeight(screen.font); - } - int n = k; - int o = l; - Vector2ic vector2ic = clientTooltipPositioner.positionTooltip(graphics.guiWidth(), graphics.guiHeight(), i, j, n, o); - int p = vector2ic.x(); - int q = vector2ic.y(); - - int maxWidth = 0; - - for (t = 0; t < list.size(); ++t) { - clientTooltipComponent2 = list.get(t); - if (clientTooltipComponent2.getWidth(screen.font) > maxWidth) { - maxWidth = clientTooltipComponent2.getWidth(screen.font); - } - } - - graphics.setTooltipForNextFrame(screen.font, splitTooltip(screen.minecraft, component), p + maxWidth , q, null); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java deleted file mode 100644 index ae353dd..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.components.WidgetTooltipHolder; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; - -public class AdvancedWidgetTooltipHolder extends WidgetTooltipHolder { - - public AdvancedWidgetTooltipHolder() { - super(); - } - - public AdvancedWidgetTooltipHolder(Tooltip tooltip) { - this(); - } - - public boolean hasCustomRender() { - return this.get() instanceof AdvancedTooltip advanced && advanced.hasCustomRender(); - } - - public void doCustomRender(Screen screen, GuiGraphics graphics, int x, int y, ClientTooltipPositioner positioner) { - ((AdvancedTooltip) this.get()).doCustomRender(screen, graphics, x, y, positioner); - } - - @Override // ideally tooltip shouldn't control it's own render like this, but for now it does - public void refreshTooltipForNextRenderPass(GuiGraphics guiGraphics, int i, int j, boolean hovered, boolean focused, ScreenRectangle screenRectangle) { - if (this.hasCustomRender()) - return; - - super.refreshTooltipForNextRenderPass(guiGraphics, i, j, hovered, focused, screenRectangle); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java index 8e8d09d..b129113 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java @@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; @@ -18,7 +18,7 @@ public class InvisibleButton extends Button { } @Override - public void renderContents(GuiGraphics graphics, int i, int j, float f) { + public void extractContents(GuiGraphicsExtractor graphics, int i, int j, float f) { // NO-OP } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java b/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java deleted file mode 100644 index b1af334..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import java.util.List; - -import com.google.common.collect.ImmutableList; - -import net.minecraft.client.gui.components.WidgetSprites; - -public class SwitchableSprites { - private final List sprites; - private int index = 0; - - private SwitchableSprites(WidgetSprites def, WidgetSprites... sprites) { - ImmutableList.Builder builder = ImmutableList.builder(); - - builder.add(def); - builder.add(sprites); - - this.sprites = builder.build(); - } - - public SwitchableSprites setIndex(int index) { - if (index >= this.sprites.size()) { - index = this.sprites.size() - 1; - } else if (index < 0) { - index = 0; - } - - this.index = index; - return this; - } - - public int getIndex() { - return this.index; - } - - public WidgetSprites get(int index) { - return this.sprites.get(index); - } - - public WidgetSprites getDefault() { - return this.get(0); - } - - public WidgetSprites getCurrent() { - return this.get(this.index); - } - - public static SwitchableSprites of(WidgetSprites def, WidgetSprites... sprites) { - return new SwitchableSprites(def, sprites); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 57ca9de..9673848 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -13,18 +13,15 @@ import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; -import com.aizistral.nochatreports.common.gui.AdvancedImageButton; -import com.aizistral.nochatreports.common.gui.AdvancedTooltip; import com.aizistral.nochatreports.common.gui.GUIShenanigans; -import com.aizistral.nochatreports.common.gui.SwitchableSprites; import com.aizistral.nochatreports.common.gui.TooltipHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ComponentPath; -import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.CycleButton; import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.navigation.FocusNavigationEvent; import net.minecraft.client.gui.screens.ChatScreen; @@ -45,7 +42,6 @@ import net.minecraft.resources.Identifier; public abstract class MixinChatScreen extends Screen { private static final Identifier CHAT_STATUS_ICONS = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/chat_status_icons_extended.png"); private static final Identifier ENCRYPTION_BUTTON = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/encryption_toggle_button.png"); - private AdvancedImageButton safetyStatusButton; @Shadow protected EditBox input; @@ -90,84 +86,44 @@ public abstract class MixinChatScreen extends Screen { @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { - int buttonX = this.width - 23; - if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) { - this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, - SwitchableSprites.of( - GUIShenanigans.getSprites("safety_state/insecure"), - GUIShenanigans.getSprites("safety_state/unintrusive"), - GUIShenanigans.getSprites("safety_state/secure"), - GUIShenanigans.getSprites("safety_state/realms"), - GUIShenanigans.getSprites("safety_state/unknown"), - GUIShenanigans.getSprites("safety_state/undefined") - ).setIndex(this.getSpriteSet()), - btn -> { + CycleButton safetyStatusButton = CycleButton.builder( + mode -> Component.empty(), + NCRConfig.getServerPreferences().getModeUnresolved(ServerSafetyState.getLastServer()) + ) + .withValues(NCRClient.areSigningKeysPresent() + ? new SigningMode[]{ SigningMode.DEFAULT, SigningMode.NEVER, SigningMode.ALWAYS, SigningMode.PROMPT, SigningMode.ON_DEMAND } + : new SigningMode[]{ SigningMode.NEVER_FORCED }) + .withSprite((btn, value) -> { + var sprites = switch (ServerSafetyState.getCurrent()) { + case INSECURE -> GUIShenanigans.getSprites("safety_state/insecure"); + case UNINTRUSIVE -> GUIShenanigans.getSprites("safety_state/unintrusive"); + case SECURE, SINGLEPLAYER -> GUIShenanigans.getSprites("safety_state/secure"); + case REALMS -> GUIShenanigans.getSprites("safety_state/realms"); + case UNKNOWN -> GUIShenanigans.getSprites("safety_state/unknown"); + case UNDEFINED -> GUIShenanigans.getSprites("safety_state/undefined"); + }; + return sprites.get(btn.isActive(), btn.isHoveredOrFocused()); + }) + .withTooltip(mode -> Tooltip.create(createSafetyTooltip(mode))) + .displayState(CycleButton.DisplayState.HIDE) + .create( + this.width - 23, this.height - 37, 20, 20, + Component.empty(), + (btn, mode) -> { if (!NCRClient.areSigningKeysPresent()) return; var address = ServerSafetyState.getLastServer(); - if (address != null) { var preferences = NCRConfig.getServerPreferences(); - preferences.setMode(address, preferences.getModeUnresolved(address).next()); + preferences.setMode(address, mode); preferences.saveFile(); } - }, Component.empty(), this); - this.safetyStatusButton.setTooltip(new AdvancedTooltip(() -> { - MutableComponent tooltip = this.getSafetyLevel().getTooltip(); - - if (ServerSafetyState.allowChatSigning()) { - tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing"); - } else if (ServerSafetyState.isInSingleplayer()) - return tooltip; - - ServerAddress address = ServerSafetyState.getLastServer(); - SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address); - String signing = "gui.nochatreports.signing_status."; - - if (!this.minecraft.getConnection().getConnection().isEncrypted()) { - signing += "disabled_offline"; - } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { - signing += "allowed_realms"; - } else if (mode.resolve() == SigningMode.ALWAYS) { - if (ServerSafetyState.allowChatSigning()) { - signing += "allowed"; - } else { - signing += "disabled_allowance_pending"; } - } else if (ServerSafetyState.allowChatSigning()) { - signing += "allowed_session"; - } else { - signing += "disabled"; - } - - tooltip.append("\n\n"); - tooltip.append(Component.translatable(signing)); - - if (ServerSafetyState.isOnRealms()) - return tooltip; + ); - tooltip.append("\n\n"); - tooltip.append(Component.translatable("gui.nochatreports.safety_status_button.controls")); - tooltip.append("\n\n"); - tooltip.append(Component.translatable("gui.nochatreports.signing_mode", - mode.getName().withStyle(ChatFormatting.BOLD, ChatFormatting.AQUA))); - tooltip.append("\n"); - tooltip.append((mode == SigningMode.DEFAULT ? mode.resolve() : mode).getTooltip()); - - return tooltip; - }).setMaxWidth(250).setRenderWithoutGap(true)); - - this.addRenderableWidget(this.safetyStatusButton); - buttonX -= 25; - } - } - - @Override - public void tick() { - if (this.safetyStatusButton != null) { - this.safetyStatusButton.useSprites(this.getSpriteSet()); + this.addRenderableWidget(safetyStatusButton); } } @@ -175,19 +131,47 @@ public abstract class MixinChatScreen extends Screen { return ServerSafetyState.getCurrent(); } - private int getSpriteSet() { - return this.getSpriteSet(this.getSafetyLevel()); - } + private Component createSafetyTooltip(SigningMode mode) { + MutableComponent tooltip = this.getSafetyLevel().getTooltip(); + + if (ServerSafetyState.allowChatSigning()) { + tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing"); + } else if (ServerSafetyState.isInSingleplayer()) + return tooltip; + + String signing = "gui.nochatreports.signing_status."; + + if (!this.minecraft.getConnection().getConnection().isEncrypted()) { + signing += "disabled_offline"; + } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { + signing += "allowed_realms"; + } else if (mode.resolve() == SigningMode.ALWAYS) { + if (ServerSafetyState.allowChatSigning()) { + signing += "allowed"; + } else { + signing += "disabled_allowance_pending"; + } + } else if (ServerSafetyState.allowChatSigning()) { + signing += "allowed_session"; + } else { + signing += "disabled"; + } + + tooltip.append("\n\n"); + tooltip.append(Component.translatable(signing)); + + if (ServerSafetyState.isOnRealms()) + return tooltip; + + tooltip.append("\n\n"); + tooltip.append(Component.translatable("gui.nochatreports.safety_status_button.controls")); + tooltip.append("\n\n"); + tooltip.append(Component.translatable("gui.nochatreports.signing_mode", + mode.getName().withStyle(ChatFormatting.BOLD, ChatFormatting.AQUA))); + tooltip.append("\n"); + tooltip.append((mode == SigningMode.DEFAULT ? mode.resolve() : mode).getTooltip()); - private int getSpriteSet(ServerSafetyLevel level) { - return switch (level) { - case INSECURE -> 0; - case UNINTRUSIVE -> 1; - case SECURE, SINGLEPLAYER -> 2; - case REALMS -> 3; - case UNKNOWN -> 4; - case UNDEFINED -> 5; - }; + return tooltip; } @Shadow diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java index 9b7fac5..d968a93 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.common.config.NCRConfig; -import net.minecraft.client.GuiMessageTag; +import net.minecraft.client.multiplayer.chat.GuiMessageTag; @Mixin(GuiMessageTag.class) public class MixinGuiMessageTag { diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java index d0ca0b9..3978da2 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.common.mixins.client; +import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import net.minecraft.client.gui.layouts.LinearLayout; import org.spongepowered.asm.mixin.Final; @@ -11,10 +13,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyState; -import com.aizistral.nochatreports.common.gui.AdvancedImageButton; -import com.aizistral.nochatreports.common.gui.AdvancedTooltip; +import net.minecraft.client.gui.components.CycleButton; import com.aizistral.nochatreports.common.gui.GUIShenanigans; -import com.aizistral.nochatreports.common.gui.SwitchableSprites; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; @@ -48,36 +48,39 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { }); if (NCRConfig.getClient().showReloadButton()) { - var button = new AdvancedImageButton(0, 0, 20, 20, - SwitchableSprites.of(GUIShenanigans.getSprites("config_reload_button")), - btn -> NCRConfig.load(), CommonComponents.EMPTY, this); - button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250)); + var button = new ImageButton(0, 0, 20, 20, + GUIShenanigans.getSprites("config_reload_button"), + btn -> NCRConfig.load(), CommonComponents.EMPTY); + button.setTooltip(Tooltip.create(RELOAD_TOOLTIP)); button.active = true; button.visible = true; ncrButtons.addChild(button); } if (NCRConfig.getClient().showNCRButton()) { - var button = new AdvancedImageButton(0, 0, 20, 20, - SwitchableSprites.of( - GUIShenanigans.getSprites("ncr_active_button"), - GUIShenanigans.getSprites("ncr_inactive_button") - ).setIndex(NCRConfig.getClient().enableMod() ? 0 : 1), - btn -> { - NCRConfig.getClient().toggleMod(); - boolean enabled = NCRConfig.getClient().enableMod(); + var button = CycleButton.onOffBuilder(NCRConfig.getClient().enableMod()) + .withSprite((btn, value) -> { + var sprites = GUIShenanigans.getSprites( + value ? "ncr_active_button" : "ncr_inactive_button" + ); + return sprites.get(btn.isActive(), btn.isHoveredOrFocused()); + }) + .withTooltip(value -> Tooltip.create( + Component.translatable( + "gui.nochatreports.ncr_toggle_tooltip", + Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (value ? "on" : "off")) + ) + )) + .displayState(CycleButton.DisplayState.HIDE) + .create( + 0, 0, 20, 20, + Component.empty(), + (btn, value) -> { + NCRConfig.getClient().setEnableMod(value); + ServerSafetyState.reset(); + } + ); - if (enabled) { - ((AdvancedImageButton)btn).useSprites(0); - } else { - ((AdvancedImageButton)btn).useSprites(1); - } - - ServerSafetyState.reset(); - }, Component.translatable("gui.nochatreports.ncr_toggle"), this); - button.setTooltip(new AdvancedTooltip(() -> Component.translatable("gui.nochatreports.ncr_toggle_tooltip", - Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (NCRConfig.getClient() - .enableMod() ? "on" : "off")))).setMaxWidth(250)); button.active = true; button.visible = true; ncrButtons.addChild(button); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java index d9434e4..cdc1aef 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java @@ -6,7 +6,7 @@ import com.aizistral.nochatreports.common.gui.FontHelper; import com.google.common.collect.Lists; import com.mojang.blaze3d.opengl.GlStateManager; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList; import net.minecraft.client.multiplayer.ServerData; @@ -37,8 +37,8 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { @Shadow @Final private ServerData serverData; - @Inject(method = "renderContent", at = @At("RETURN")) - private void onRender(GuiGraphics graphics, int i, int j, boolean bl, float f, CallbackInfo info) { + @Inject(method = "extractContent", at = @At("RETURN")) + private void onRender(GuiGraphicsExtractor graphics, int mouseX, int mouseY, boolean hovered, float a, CallbackInfo info) { if (!NCRConfig.getClient().verifiedIconEnabled()) return; @@ -50,13 +50,13 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { graphics.blitSprite(RenderPipelines.GUI_TEXTURED, VERIFIED_ICON, this.getContentRight() - 35 + xOffset, this.getContentY() - 1 + yOffset, 14, 14); GlStateManager._disableBlend(); - int t = i - this.getContentX(); - int u = j - this.getContentY(); + int t = mouseX - this.getContentX(); + int u = mouseY - this.getContentY(); if (t >= this.getContentWidth() - 35 + xOffset && t <= this.getContentWidth() - 22 + xOffset && u >= 0 + yOffset && u <= 11 + yOffset) { graphics.setTooltipForNextFrame(Lists.transform(FontHelper.wrap(this.minecraft.font, Language.getInstance().getOrDefault("gui.nochatreports.verified_server"), 250).stream() .map(Component::literal).collect(Collectors.toCollection(() -> - new ArrayList())), Component::getVisualOrderText), i, j); + new ArrayList())), Component::getVisualOrderText), mouseX, mouseY); } } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java index 9954766..f40b9ae 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java @@ -4,6 +4,7 @@ import java.time.Duration; import java.util.UUID; import java.util.function.Supplier; +import net.minecraft.client.gui.components.ImageButton; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -13,9 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyState; -import com.aizistral.nochatreports.common.gui.AdvancedImageButton; import com.aizistral.nochatreports.common.gui.InvisibleButton; -import com.aizistral.nochatreports.common.gui.SwitchableSprites; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; @@ -44,8 +43,8 @@ public class MixinPlayerEntry { this.reportButton = new InvisibleButton(); this.reportButton.active = this.reportButton.visible = false; } else if (ServerSafetyState.getCurrent().isSecure() && this.reportButton != null) { - this.reportButton = new AdvancedImageButton(0, 0, 20, 20, SwitchableSprites.of(REPORT_BUTTON_SPRITES), - button -> {}, Component.translatable("gui.socialInteractions.report"), screen); + this.reportButton = new ImageButton(0, 0, 20, 20, REPORT_BUTTON_SPRITES, + button -> {}, Component.translatable("gui.socialInteractions.report")); this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP)); this.reportButton.setTooltipDelay(Duration.ofMillis(500L)); this.reportButton.active = false; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index 4d6ea86..b005f5b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -20,7 +20,7 @@ public class MixinTitleScreen extends Screen { throw new IllegalStateException("Can't touch this"); } - @Inject(method = { "method_55814", "lambda$createNormalMenuOptions$11" }, at = @At("HEAD"), cancellable = true) + @Inject(method = { "lambda$createNormalMenuOptions$2" }, at = @At("HEAD"), cancellable = true) private void onRealmsButtonClicked(Button button, CallbackInfo info) { if (RealmsWarningScreen.shouldShow()) { this.minecraft.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); 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