From 4fb3972416131a246bc8772d374224c5faf8e153 Mon Sep 17 00:00:00 2001 From: lionarius Date: Sun, 27 Apr 2025 12:53:05 +0300 Subject: [PATCH] backport to 1.19.3 --- .../skinrestorer/translation/Translation.java | 4 ++-- .../lionarius/skinrestorer/util/PlayerUtils.java | 8 ++------ gradle.properties | 16 ++++++++-------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java b/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java index ec2b567..aa28598 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java +++ b/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java @@ -39,11 +39,11 @@ public final class Translation { } public static MutableComponent translatableWithFallback(String key) { - return Component.translatableWithFallback(key, Translation.get(key)); + return Component.translatable(Translation.get(key)); } public static MutableComponent translatableWithFallback(String key, Object... args) { - return Component.translatableWithFallback(key, Translation.get(key), args); + return Component.translatable(Translation.get(key), args); } public static void reloadTranslations() { diff --git a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java index 33e25ec..83fd3e8 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java +++ b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java @@ -44,12 +44,8 @@ public final class PlayerUtils { PlayerList playerList = serverLevel.getServer().getPlayerList(); ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap; - playerList.broadcastAll(new ClientboundBundlePacket( - List.of( - new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID())), - ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(Collections.singleton(player)) - ) - )); + playerList.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID()))); + playerList.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(Collections.singleton(player))); var trackedEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId()); if (trackedEntity != null) { diff --git a/gradle.properties b/gradle.properties index 69fdec9..69197a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ group=net.lionarius java_version=17 # Common -minecraft_version=1.19.4 -minecraft_version_list=1.19.4 -minecraft_version_range=[1.19.4,1.20) +minecraft_version=1.19.3 +minecraft_version_list=1.19.3 +minecraft_version_range=[1.19.3,1.19.4) mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.3.0 @@ -21,18 +21,18 @@ description=A server-side mod for managing skins. mineskin_client_version=3.0.1-SNAPSHOT # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions -parchment_minecraft=1.19.4 -parchment_version=2023.06.26 +parchment_minecraft=1.19.3 +parchment_version=2023.06.25 # Fabric, see https://fabricmc.net/develop/ for new versions fabric_loader_version=0.15.0 fabric_optional_dependencies= # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions -forge_version=45.0.0 -forge_loader_version_range=[45,) +forge_version=44.0.0 +forge_loader_version_range=[44,) # Forge sometimes skips minor minecraft versions (like 1.20.5) -forge_minecraft_version=1.19.4 +forge_minecraft_version=1.19.3 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions neoforge_version=20.2.3-beta