From 51fd8970842b4ffb2e6e78c89c499ca9a3d00511 Mon Sep 17 00:00:00 2001 From: Tert0 Date: Mon, 31 Mar 2025 13:23:42 +0200 Subject: Update to 1.21.5 (#510) * update to 1.21.5 * gha workflow: update upload-artifact and add neoforge builds--- .github/workflows/build.yml | 5 +++-- build.gradle | 2 +- forge/build.gradle | 8 +++++++- gradle.properties | 24 +++++++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 2 +- .../common/config/ClothConfigIntegration.java | 3 ++- .../common/gui/EncryptionConfigScreen.java | 4 ++-- .../mixins/client/MixinOnlineServerEntry.java | 6 +++--- .../common/mixins/client/MixinServerData.java | 2 +- .../common/mixins/client/MixinTitleScreen.java | 3 +-- 11 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b844d4b..0693f02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,9 +30,10 @@ jobs: run: ./gradlew build - name: Upload build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts from one OS and required JDK. - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Artifacts path: | build/libs/ - forge/build/libs/ \ No newline at end of file + forge/build/libs/ + neoforge/build/libs/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 612e128..247fbcc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import org.apache.tools.ant.taskdefs.condition.Os plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.10.2' id 'maven-publish' id "com.modrinth.minotaur" version "2.+" id "com.matthewprenger.cursegradle" version "1.+" diff --git a/forge/build.gradle b/forge/build.gradle index 554643f..8c838a3 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -19,7 +19,7 @@ buildscript { } } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.24,6.2)' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '[6.0.35,6.2)' classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' classpath 'org.spongepowered:mixingradle:0.7.+' } @@ -247,4 +247,10 @@ publishing { url "file:///${project.projectDir}/mcmodsrepo" } } +} + +sourceSets.each { + def dir = layout.buildDirectory.dir("sourceSets/$it.name") + it.output.resourcesDir = dir + it.java.destinationDirectory = dir } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8337317..a2c57b7 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.4 -yarn_mappings=1.21.4+build.1 -fabric_loader_version=0.16.9 -forge_version=1.21.4-54.0.1 -neoforge_version=21.4.9-beta +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +fabric_loader_version=0.16.10 +forge_version=1.21.5-55.0.3 +neoforge_version=21.5.7-beta # Mod Properties -mod_version=1.21.4-v2.11.0 +mod_version=1.21.5-v2.11.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.111.0+1.21.4 -mod_menu_version=13.0.0-beta.1 -cloth_config_version=16.0.141 +fabric_version=0.119.6+1.21.5 +mod_menu_version=14.0.0-rc.2 +cloth_config_version=18.0.145 # Dependencies in mods.toml -dep_forge=[53,) -dep_neoforge=[21.0.0,) -dep_minecraft=[1.21.4,) +dep_forge=[55,) +dep_neoforge=[21.5.0,) +dep_minecraft=[1.21.5,) # Publishing curse_id=634062 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..e18bc25 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.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 0a09c88..affba72 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -22,7 +22,7 @@ plugins { id 'eclipse' id 'idea' id "com.modrinth.minotaur" version "2.+" - id 'net.neoforged.gradle.userdev' version '7.0.145' + id 'net.neoforged.gradle.userdev' version '7.0.183' } println("Applying plugins...") 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 96bce48..1d844db 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.common.config; +import java.net.URI; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; @@ -184,7 +185,7 @@ public final class ClothConfigIntegration { // Add link for documentation for showServerSafety client.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo") .withStyle(s -> s - .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety")))) + .withHoverEvent(new HoverEvent.ShowText(Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent.OpenUrl(URI.create("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))))) .build()); // Set an option for hideInsecureMessageIndicators diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java index 3fad5a4..e168522 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports.common.gui; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.config.NCRConfigEncryption; import com.aizistral.nochatreports.common.encryption.Encryption; -import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.opengl.GlStateManager; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.Font; @@ -192,7 +192,7 @@ public class EncryptionConfigScreen extends Screen { if (!this.passField.active) { graphics.drawString(this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4, this.passField.getY() + 5, 0x999999); - RenderSystem.enableDepthTest(); + GlStateManager._enableDepthTest(); graphics.blitSprite(RenderType::guiTextured, CROSSMARK, this.passField.getX() - 20, this.passField.getY() + 3, 14, 13); } } 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 bbea9fd..278eb83 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 @@ -4,7 +4,7 @@ import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerDataExtension; import com.aizistral.nochatreports.common.gui.FontHelper; import com.google.common.collect.Lists; -import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.opengl.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; @@ -46,9 +46,9 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { int xOffset = NCRConfig.getClient().getVerifiedIconOffsetX(), yOffset = NCRConfig.getClient().getVerifiedIconOffsetY(); - RenderSystem.enableBlend(); + GlStateManager._enableBlend(); graphics.blitSprite(RenderType::guiTextured, VERIFIED_ICON, k + l - 35 + xOffset, j - 1 + yOffset, 14, 14); - RenderSystem.disableBlend(); + GlStateManager._disableBlend(); int t = n - k; int u = o - j; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java index 095cf7f..f4ec56b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java @@ -40,7 +40,7 @@ public class MixinServerData implements ServerDataExtension { @Inject(method = "read", locals = LocalCapture.CAPTURE_FAILSOFT, at = @At("RETURN")) private static void onRead(CompoundTag tag, CallbackInfoReturnable info, ServerData data) { - ((ServerDataExtension)data).setPreventsChatReports(tag.getBoolean("preventsChatReports")); + ((ServerDataExtension)data).setPreventsChatReports(tag.getBooleanOr("preventsChatReports", 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 f010c1e..a36a4aa 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,12 +20,11 @@ public class MixinTitleScreen extends Screen { throw new IllegalStateException("Can't touch this"); } - @Inject(method = { "realmsButtonClicked", "method_55814", "lambda$createNormalMenuOptions$10" }, at = @At("HEAD"), cancellable = true) + @Inject(method = { "method_55814", "lambda$createNormalMenuOptions$10" }, 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))); info.cancel(); } } - } -- cgit v1.2.3