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 ec59754..99e406f 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java +++ b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java @@ -66,12 +66,7 @@ public final class PlayerUtils { } if (!player.isDeadOrDying()) { - player.connection.send(new ClientboundBundlePacket( - List.of( - new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA), - new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0) - ) - )); + player.connection.send(new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA)); player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot()); player.connection.send(new ClientboundSetEntityMotionPacket(player)); var vehicle = player.getVehicle(); diff --git a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java index ac6cdc2..b54ccc3 100644 --- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java +++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class MinecraftServerMixin { @Inject(method = "runServer", - at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J", ordinal = 0)) + at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()J", ordinal = 0)) private void onServerStarted(CallbackInfo ci) { SkinRestorer.onServerStarted((MinecraftServer) (Object) this); } diff --git a/gradle.properties b/gradle.properties index 92fecc9..956b603 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,9 @@ group=net.lionarius.skinrestorer java_version=17 # Common -minecraft_version=1.20.3 -minecraft_version_list=1.20.3,1.20.4 -minecraft_version_range=[1.20.3,1.20.4] +minecraft_version=1.20.2 +minecraft_version_list=1.20.2 +minecraft_version_range=1.20.2 mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.0.2 @@ -21,20 +21,20 @@ credits= description=A server-side mod for managing skins. # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions -parchment_minecraft=1.20.3 -parchment_version=2023.12.31 +parchment_minecraft=1.20.2 +parchment_version=2023.12.10 # Fabric, see https://fabricmc.net/develop/ for new versions fabric_loader_version=0.15.0 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions -forge_version=49.0.1 -forge_loader_version_range=[49,) +forge_version=48.0.0 +forge_loader_version_range=[48,) # Forge sometimes skips minor minecraft versions (like 1.20.5) -forge_minecraft_version=1.20.3 +forge_minecraft_version=1.20.2 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions -neoforge_version=20.3.1-beta +neoforge_version=20.2.3-beta neoforge_loader_version_range=[1,) # Publishing