25w19a

src/main/java/carpet/commands/PlayerCommand.java

@@ -229,7 +229,7 @@ public class PlayerCommand
     {
         if (cantReMove(context)) return 0;
         ServerPlayer player = getPlayer(context);
-        player.kill(player.serverLevel());
+        player.kill(player.level());
         return 1;
     }
 
@@ -342,7 +342,7 @@ public class PlayerCommand
             return 0;
         }
 
-        EntityPlayerMPFake.createShadow(player.server, player);
+        EntityPlayerMPFake.createShadow(player.getServer(), player);
         return 1;
     }
 }

src/main/java/carpet/helpers/EntityPlayerActionPack.java

@@ -310,7 +310,7 @@ public class EntityPlayerActionPack
                         case BLOCK:
                         {
                             player.resetLastActionTime();
-                            ServerLevel world = player.serverLevel();
+                            ServerLevel world = player.level();
                             BlockHitResult blockHit = (BlockHitResult) hit;
                             BlockPos pos = blockHit.getBlockPos();
                             Direction side = blockHit.getDirection();

src/main/java/carpet/helpers/ParticleDisplay.java

@@ -9,7 +9,7 @@ public class ParticleDisplay
     public static void drawParticleLine(ServerPlayer player, Vec3 from, Vec3 to, ParticleOptions mainParticle, ParticleOptions accentParticle, int count, double spread)
     {
 
-        if (accentParticle != null) player.serverLevel().sendParticles(
+        if (accentParticle != null) player.level().sendParticles(
                 player,
                 accentParticle,
                 true, true,
@@ -24,7 +24,7 @@ public class ParticleDisplay
              delta.lengthSqr() < lineLengthSq;
              delta = delta.add(incvec.scale(player.level().random.nextFloat())))
         {
-            player.serverLevel().sendParticles(
+            player.level().sendParticles(
                     player,
                     mainParticle,
                     true, true,

src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java

@@ -257,7 +257,7 @@ public class ServerGamePacketListenerImpl_scarpetEventsMixin
     {
         if (PLAYER_CHOOSES_RECIPE.isNeeded())
         {
-            RecipeManager.ServerDisplayInfo displayInfo = player.server.getRecipeManager().getRecipeFromDisplay(packet.recipe());
+            RecipeManager.ServerDisplayInfo displayInfo = player.getServer().getRecipeManager().getRecipeFromDisplay(packet.recipe());
             if (displayInfo == null) {
                 return;
             }

src/main/java/carpet/mixins/ServerGamePacketListenerimpl_connectionMixin.java

@@ -26,7 +26,7 @@ public class ServerGamePacketListenerimpl_connectionMixin
             // We should force onto the main thread here
             // ServerNetworkHandler.handleData can possibly mutate data that isn't
             // thread safe, and also allows for client commands to be executed
-            PacketUtils.ensureRunningOnSameThread(serverboundCustomPayloadPacket, (ServerGamePacketListener) this, player.serverLevel());
+            PacketUtils.ensureRunningOnSameThread(serverboundCustomPayloadPacket, (ServerGamePacketListener) this, player.level());
             ServerNetworkHandler.onClientData(player, cpp.data());
             ci.cancel();
         }

src/main/java/carpet/network/ServerNetworkHandler.java

@@ -61,7 +61,7 @@ public class ServerNetworkHandler
         {
             CarpetSettings.LOG.warn("Player " + playerEntity.getName().getString() + " joined with another carpet version: " + version);
         }
-        DataBuilder data = DataBuilder.create(playerEntity.server); // tickrate related settings are sent on world change
+        DataBuilder data = DataBuilder.create(playerEntity.getServer()); // tickrate related settings are sent on world change
         CarpetServer.forEachManager(sm -> sm.getCarpetRules().forEach(data::withRule));
         playerEntity.connection.send(data.build());
     }
@@ -110,7 +110,7 @@ public class ServerNetworkHandler
         {
             result.put("output", outputResult);
         }
-        player.connection.send(DataBuilder.create(player.server).withCustomNbt("clientCommand", result).build());
+        player.connection.send(DataBuilder.create(player.getServer()).withCustomNbt("clientCommand", result).build());
         // run command plug to command output,
     }
 
@@ -137,7 +137,7 @@ public class ServerNetworkHandler
         }
         for (ServerPlayer player : remoteCarpetPlayers.keySet())
         {
-            player.connection.send(DataBuilder.create(player.server).withRule(rule).build());
+            player.connection.send(DataBuilder.create(player.getServer()).withRule(rule).build());
         }
     }
 
@@ -149,7 +149,7 @@ public class ServerNetworkHandler
         }
         for (ServerPlayer player : validCarpetPlayers)
         {
-            player.connection.send(DataBuilder.create(player.server).withCustomNbt(command, data).build());
+            player.connection.send(DataBuilder.create(player.getServer()).withCustomNbt(command, data).build());
         }
     }
 
@@ -157,7 +157,7 @@ public class ServerNetworkHandler
     {
         if (isValidCarpetPlayer(player))
         {
-            player.connection.send(DataBuilder.create(player.server).withCustomNbt(command, data).build());
+            player.connection.send(DataBuilder.create(player.getServer()).withCustomNbt(command, data).build());
         }
     }
 

src/main/java/carpet/patches/EntityPlayerMPFake.java

@@ -117,7 +117,7 @@ public class EntityPlayerMPFake extends ServerPlayer
     {
         player.getServer().getPlayerList().remove(player);
         player.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"));
-        ServerLevel worldIn = player.serverLevel();//.getWorld(player.dimension);
+        ServerLevel worldIn = player.level();//.getWorld(player.dimension);
         GameProfile gameprofile = player.getGameProfile();
         EntityPlayerMPFake playerShadow = new EntityPlayerMPFake(server, worldIn, gameprofile, player.clientInformation(), true);
         playerShadow.setChatSession(player.getChatSession());
@@ -174,7 +174,7 @@ public class EntityPlayerMPFake extends ServerPlayer
         if (reason.getContents() instanceof TranslatableContents text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
             this.connection.onDisconnect(new DisconnectionDetails(reason));
         } else {
-            this.server.schedule(new TickTask(this.server.getTickCount(), () -> {
+            this.getServer().schedule(new TickTask(this.getServer().getTickCount(), () -> {
                 this.connection.onDisconnect(new DisconnectionDetails(reason));
             }));
         }
@@ -186,7 +186,7 @@ public class EntityPlayerMPFake extends ServerPlayer
         if (this.getServer().getTickCount() % 10 == 0)
         {
             this.connection.resetPosition();
-            this.serverLevel().getChunkSource().move(this);
+            this.level().getChunkSource().move(this);
         }
         try
         {

src/main/java/carpet/patches/NetHandlerPlayServerFake.java

@@ -37,9 +37,9 @@ public class NetHandlerPlayServerFake extends ServerGamePacketListenerImpl
     public void teleport(PositionMoveRotation positionMoveRotation, Set<Relative> set)
     {
         super.teleport(positionMoveRotation, set);
-        if (player.serverLevel().getPlayerByUUID(player.getUUID()) != null) {
+        if (player.level().getPlayerByUUID(player.getUUID()) != null) {
             resetPosition();
-            player.serverLevel().getChunkSource().move(player);
+            player.level().getChunkSource().move(player);
         }
     }
 

src/main/java/carpet/script/CarpetEventServer.java

@@ -604,7 +604,7 @@ public class CarpetEventServer
                 return handler.call(() ->
                         Arrays.asList(
                                 new EntityValue(player),
-                                new BlockValue(null, player.serverLevel(), blockpos),
+                                new BlockValue(null, player.level(), blockpos),
                                 StringValue.of(facing.getName())
                         ), player::createCommandSourceStack);
             }
@@ -624,7 +624,7 @@ public class CarpetEventServer
                             new EntityValue(player),
                             ValueConversions.of(itemstack, player.level().registryAccess()),
                             StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
-                            new BlockValue(null, player.serverLevel(), blockpos),
+                            new BlockValue(null, player.level(), blockpos),
                             StringValue.of(enumfacing.getName()),
                             ListValue.of(
                                     new NumericValue(vec3d.x),
@@ -648,7 +648,7 @@ public class CarpetEventServer
                     return Arrays.asList(
                             new EntityValue(player),
                             StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
-                            new BlockValue(null, player.serverLevel(), blockpos),
+                            new BlockValue(null, player.level(), blockpos),
                             StringValue.of(enumfacing.getName()),
                             ListValue.of(
                                     new NumericValue(vec3d.x),
@@ -669,7 +669,7 @@ public class CarpetEventServer
                         new EntityValue(player),
                         ValueConversions.of(itemstack, player.level().registryAccess()),
                         StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
-                        new BlockValue(null, player.serverLevel(), pos)
+                        new BlockValue(null, player.level(), pos)
                 ), player::createCommandSourceStack);
             }
         };
@@ -682,7 +682,7 @@ public class CarpetEventServer
                         new EntityValue(player),
                         ValueConversions.of(itemstack, player.level().registryAccess()),
                         StringValue.of(enumhand == InteractionHand.MAIN_HAND ? "mainhand" : "offhand"),
-                        new BlockValue(null, player.serverLevel(), pos)
+                        new BlockValue(null, player.level(), pos)
                 ), player::createCommandSourceStack);
                 return false;
             }
@@ -693,7 +693,7 @@ public class CarpetEventServer
             public boolean onBlockBroken(ServerPlayer player, BlockPos pos, BlockState previousBS)
             {
                 return handler.call(
-                        () -> Arrays.asList(new EntityValue(player), new BlockValue(previousBS, player.serverLevel(), pos)),
+                        () -> Arrays.asList(new EntityValue(player), new BlockValue(previousBS, player.level(), pos)),
                         player::createCommandSourceStack
                 );
             }
@@ -1336,7 +1336,7 @@ public class CarpetEventServer
                         valArgs.add(EntityValue.of(player));
                         for (Object o : args)
                         {
-                            valArgs.add(ValueConversions.guess(player.serverLevel(), o));
+                            valArgs.add(ValueConversions.guess(player.level(), o));
                         }
                         return valArgs;
                     }, player::createCommandSourceStack

src/main/java/carpet/script/utils/ShapeDispatcher.java

@@ -777,7 +777,7 @@ public class ShapeDispatcher
                 }
 
                 Vec3 v = relativiseRender(p.level(), this.pos, 0);
-                p.serverLevel().sendParticles(p, particle, true, true, v.x, v.y, v.z, 1, 0.0, 0.0, 0.0, 0.0);
+                p.level().sendParticles(p, particle, true, true, v.x, v.y, v.z, 1, 0.0, 0.0, 0.0, 0.0);
             };
         }
 
@@ -1072,7 +1072,7 @@ public class ShapeDispatcher
                     ParticleOptions locparticledata = new DustParticleOptions(ARGB.colorFromFloat(1.0f, fr, fg, fb), 1);
                     for (Vec3 v : getAlterPoint(p))
                     {
-                        p.serverLevel().sendParticles(p, locparticledata, true, true,
+                        p.level().sendParticles(p, locparticledata, true, true,
                                 v.x, v.y, v.z, 1,
                                 0.0, 0.0, 0.0, 0.0);
                     }
@@ -1282,7 +1282,7 @@ public class ShapeDispatcher
             {
                 int partno = Math.min(1000, 20 * subdivisions);
                 RandomSource rand = p.level().getRandom();
-                ServerLevel world = p.serverLevel();
+                ServerLevel world = p.level();
                 ParticleOptions particle = replacementParticle(world.registryAccess());
 
                 Vec3 ccenter = relativiseRender(world, center, 0);
@@ -1379,7 +1379,7 @@ public class ShapeDispatcher
             {
                 int partno = (int) Math.min(1000, Math.sqrt(20 * subdivisions * (1 + height)));
                 RandomSource rand = p.level().getRandom();
-                ServerLevel world = p.serverLevel();
+                ServerLevel world = p.level();
                 ParticleOptions particle = replacementParticle(world.registryAccess());
 
                 Vec3 ccenter = relativiseRender(world, center, 0);
@@ -2185,7 +2185,7 @@ public class ShapeDispatcher
         int parts = 0;
         for (ServerPlayer player : playerList)
         {
-            ServerLevel world = player.serverLevel();
+            ServerLevel world = player.level();
             world.sendParticles(player, particle, true, true,
                     (towards.x) / 2 + from.x, (towards.y) / 2 + from.y, (towards.z) / 2 + from.z, particles / 3,
                     towards.x / 6, towards.y / 6, towards.z / 6, 0.0);
@@ -2202,7 +2202,7 @@ public class ShapeDispatcher
             int dev = 2 * divider;
             for (ServerPlayer player : playerList)
             {
-                ServerLevel world = player.serverLevel();
+                ServerLevel world = player.level();
                 world.sendParticles(player, particle, true, true,
                         (towards.x) / center + from.x, (towards.y) / center + from.y, (towards.z) / center + from.z, particles / divider,
                         towards.x / dev, towards.y / dev, towards.z / dev, 0.0);
@@ -2234,7 +2234,7 @@ public class ShapeDispatcher
                 Vec3 at = from.add(towards.scale(rand.nextDouble()));
                 for (ServerPlayer player : players)
                 {
-                    player.serverLevel().sendParticles(player, particle, true, true,
+                    player.level().sendParticles(player, particle, true, true,
                             at.x, at.y, at.z, 1,
                             0.0, 0.0, 0.0, 0.0);
                     pcount++;
@@ -2255,7 +2255,7 @@ public class ShapeDispatcher
         {
             for (ServerPlayer player : players)
             {
-                player.serverLevel().sendParticles(player, particle, true, true,
+                player.level().sendParticles(player, particle, true, true,
                         delta.x + from.x, delta.y + from.y, delta.z + from.z, 1,
                         0.0, 0.0, 0.0, 0.0);
                 pcount++;

src/main/java/carpet/script/utils/SnoopyCommandSource.java

@@ -70,12 +70,12 @@ public class SnoopyCommandSource extends CommandSourceStack
     {
         super(player.commandSource(), player.position(), player.getRotationVector(),
                 player.level() instanceof final ServerLevel serverLevel ? serverLevel : null,
-                player.server.getProfilePermissions(player.getGameProfile()), player.getName().getString(), player.getDisplayName(),
+                player.getServer().getProfilePermissions(player.getGameProfile()), player.getName().getString(), player.getDisplayName(),
                 player.level().getServer(), player);
         this.output = player.commandSource();
         this.position = player.position();
         this.world = player.level() instanceof final ServerLevel serverLevel ? serverLevel : null;
-        this.level = player.server.getProfilePermissions(player.getGameProfile());
+        this.level = player.getServer().getProfilePermissions(player.getGameProfile());
         this.simpleName = player.getName().getString();
         this.name = player.getDisplayName();
         this.server = player.level().getServer();
@@ -86,7 +86,7 @@ public class SnoopyCommandSource extends CommandSourceStack
         this.error = error;
         this.chatOutput = output;
         this.signingContext = CommandSigningContext.ANONYMOUS;
-        this.taskChainer = TaskChainer.immediate(player.server);
+        this.taskChainer = TaskChainer.immediate(player.getServer());
     }
 
     private SnoopyCommandSource(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String simpleName, Component name, MinecraftServer server, @Nullable Entity entity, CommandResultCallback consumer, EntityAnchorArgument.Anchor entityAnchor, CommandSigningContext context, TaskChainer chainer,

src/main/java/carpet/script/value/EntityValue.java

@@ -714,7 +714,7 @@ public class EntityValue extends Value
                 {
                     return Value.NULL;
                 }
-                return new BlockValue(null, sp.serverLevel(), pos);
+                return new BlockValue(null, sp.level(), pos);
             }
             return Value.NULL;
         });

src/main/java/carpet/script/value/ScreenValue.java

@@ -200,7 +200,7 @@ public class ScreenValue extends Value
             this.screenHandler = null;
             return false;
         }
-        int runPermissionLevel = Vanilla.MinecraftServer_getRunPermissionLevel(player.server);
+        int runPermissionLevel = Vanilla.MinecraftServer_getRunPermissionLevel(player.getServer());
         CommandSourceStack source = player.createCommandSourceStack().withPermission(runPermissionLevel);
         CarpetScriptHost executingHost = appHost.retrieveForExecution(source, player);
         try