diff options
| author | Tert0 | 2025-03-31 13:23:42 +0200 |
|---|---|---|
| committer | GitHub | 2025-03-31 04:23:42 -0700 |
| commit | 51fd8970842b4ffb2e6e78c89c499ca9a3d00511 (patch) | |
| tree | d0693e4f2789286e4d8be899c779f9d99677602d /src/main/java/com | |
| parent | 973d2052d8f02b5a373aee8dff85356f6a254d8d (diff) | |
Update to 1.21.5 (#510)
* update to 1.21.5
* gha workflow: update upload-artifact and add neoforge builds
Diffstat (limited to 'src/main/java/com')
5 files changed, 9 insertions, 9 deletions
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<ServerData> 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(); } } - } |
