From 311bb9cb3d90582e004002f3641415e043dc60b9 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Tue, 18 Jun 2024 14:59:01 +0200 Subject: Replace `ResourceLocation` constructor uses --- .../aizistral/nochatreports/common/gui/EncryptionConfigScreen.java | 2 +- .../java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java | 6 +++--- .../nochatreports/common/mixins/client/MixinChatScreen.java | 4 ++-- .../nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java | 2 +- .../common/mixins/client/MixinJoinMultiplayerScreen.java | 4 ++-- .../nochatreports/common/mixins/client/MixinOnlineServerEntry.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) 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 9f15a70..9e0e300 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java @@ -35,7 +35,7 @@ public class EncryptionConfigScreen extends Screen { private static final Component DICE_TOOLTIP = Component.translatable("gui.nochatreports.encryption_config.dice_tooltip"); private static final Component PASS_NOT_ALLOWED = Component.translatable("gui.nochatreports.encryption_config.pass_not_allowed"); private static final Component ENCRYPT_PUBLIC = Component.translatable("gui.nochatreports.encryption_config.encrypt_public"); - private static final ResourceLocation CROSSMARK = new ResourceLocation("nochatreports", "encryption/crossmark_big"); + private static final ResourceLocation CROSSMARK = ResourceLocation.fromNamespaceAndPath("nochatreports", "encryption/crossmark_big"); private static final int FIELDS_Y_START = 45; private final Screen previous; diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java b/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java index fd0eb2f..ef72190 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java @@ -33,9 +33,9 @@ public final class GUIShenanigans { } public static WidgetSprites getSprites(String path, boolean hasHovered, boolean hasDisabled) { - var normal = new ResourceLocation("nochatreports", path); - var hovered = hasHovered ? new ResourceLocation("nochatreports", path + "_hovered") : normal; - var disabled = hasDisabled ? new ResourceLocation("nochatreports", path + "_hovered") : hovered; + var normal = ResourceLocation.fromNamespaceAndPath("nochatreports", path); + var hovered = hasHovered ? ResourceLocation.fromNamespaceAndPath("nochatreports", path + "_hovered") : normal; + var disabled = hasDisabled ? ResourceLocation.fromNamespaceAndPath("nochatreports", path + "_hovered") : hovered; return new WidgetSprites(normal, hovered, disabled); } 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 44ef782..3965b1e 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 @@ -47,8 +47,8 @@ import net.minecraft.resources.ResourceLocation; @Mixin(ChatScreen.class) public abstract class MixinChatScreen extends Screen { private static final int MESSAGE_MAX_LENGTH = 256; - private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons_extended.png"); - private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png"); + private static final ResourceLocation CHAT_STATUS_ICONS = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/chat_status_icons_extended.png"); + private static final ResourceLocation ENCRYPTION_BUTTON = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/encryption_toggle_button.png"); private AdvancedImageButton safetyStatusButton; @Shadow protected EditBox input; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java index 41c5b5d..5d0250c 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java @@ -20,7 +20,7 @@ import net.minecraft.resources.ResourceLocation; @Mixin(GuiMessageTag.Icon.class) public abstract class MixinGuiMessageTagIcon { - private static final ResourceLocation TEXTURE_NCR = new ResourceLocation("nochatreports", "encryption/encrypted_tag"); + private static final ResourceLocation TEXTURE_NCR = ResourceLocation.fromNamespaceAndPath("nochatreports", "encryption/encrypted_tag"); @Shadow(aliases = "field_39768") @Mutable static Icon[] $VALUES; @Invoker("") 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 195d331..5711ca3 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 @@ -27,8 +27,8 @@ import net.minecraft.resources.ResourceLocation; @Mixin(JoinMultiplayerScreen.class) public abstract class MixinJoinMultiplayerScreen extends Screen { - private static final ResourceLocation RELOAD_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/config_reload_button.png"), - TOGGLE_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/ncr_toggle_button.png"); + private static final ResourceLocation RELOAD_TEXTURE = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/config_reload_button.png"), + TOGGLE_TEXTURE = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/ncr_toggle_button.png"); private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatreports.reload_config_tooltip"); protected MixinJoinMultiplayerScreen() { 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 bbd86bd..2842cbd 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 @@ -28,7 +28,7 @@ import net.minecraft.resources.ResourceLocation; @Mixin(ServerSelectionList.OnlineServerEntry.class) public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { - private static final ResourceLocation VERIFIED_ICON = new ResourceLocation("nochatreports", "verified_server"); + private static final ResourceLocation VERIFIED_ICON = ResourceLocation.fromNamespaceAndPath("nochatreports", "verified_server"); @Shadow @Final private JoinMultiplayerScreen screen; -- cgit v1.2.3