diff --git a/gradle.properties b/gradle.properties index e2a54057..3980ba29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=25w34b + minecraft_version=25w35a loader_version=0.16.14 jsr305_version=3.0.2 fabric_version=0.119.5+1.21.5 diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 338d1e0b..d2a6bad9 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -708,7 +708,7 @@ public class CarpetSettings if (server.isDedicatedServer()) { - int vd = (newValue >= 2)?newValue:((ServerInterface) server).getProperties().viewDistance; + int vd = (newValue >= 2)?newValue:((ServerInterface) server).getProperties().viewDistance.get(); if (vd != server.getPlayerList().getViewDistance()) server.getPlayerList().setViewDistance(vd); return newValue; @@ -749,7 +749,7 @@ public class CarpetSettings if (server.isDedicatedServer()) { - int vd = (newValue >= 2)?newValue:((DedicatedServer) server).getProperties().simulationDistance; + int vd = (newValue >= 2)?newValue:((DedicatedServer) server).getProperties().simulationDistance.get(); if (vd != server.getPlayerList().getSimulationDistance()) server.getPlayerList().setSimulationDistance(vd); return newValue; diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 6486a003..d7cfe239 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -80,10 +80,10 @@ public class EntityPlayerMPFake extends ServerPlayer // We need to mark this player as spawning so that we do not // try to spawn another player with the name while the profile // is being fetched - preventing multiple players spawning - String name = gameprofile.getName(); + String name = gameprofile.name(); spawning.add(name); - fetchGameProfile(server, gameprofile.getId()).whenCompleteAsync((p, t) -> { + fetchGameProfile(server, gameprofile.id()).whenCompleteAsync((p, t) -> { // Always remove the name, even if exception occurs spawning.remove(name); if (t != null) @@ -92,7 +92,7 @@ public class EntityPlayerMPFake extends ServerPlayer } GameProfile current; - if (p.getName().isEmpty()) { + if (p.name().isEmpty()) { current = gameprofile; } else {