mappings

src/main/java/carpet/script/api/Auxiliary.java

@@ -198,7 +198,7 @@ public class Auxiliary {
         {
             CarpetContext cc = (CarpetContext)c;
             if (lv.size() == 0) return ListValue.wrap(Registry.PARTICLE_TYPE.getIds().stream().map(ValueConversions::of));
-            MinecraftServer ms = cc.s.getMinecraftServer();
+            MinecraftServer ms = cc.s.getServer();
             ServerWorld world = cc.s.getWorld();
             Vector3Argument locator = Vector3Argument.findIn(lv, 1);
             String particleName = lv.get(0).getString();
@@ -270,7 +270,7 @@ public class Auxiliary {
                     }
                     else
                     {
-                        player = cc.s.getMinecraftServer().getPlayerManager().getPlayer(playerValue.getString());
+                        player = cc.s.getServer().getPlayerManager().getPlayer(playerValue.getString());
                     }
                 }
             }
@@ -310,7 +310,7 @@ public class Auxiliary {
                     }
                     else
                     {
-                        player = cc.s.getMinecraftServer().getPlayerManager().getPlayer(playerValue.getString());
+                        player = cc.s.getServer().getPlayerManager().getPlayer(playerValue.getString());
                     }
                 }
             }
@@ -485,7 +485,7 @@ public class Auxiliary {
         {
             if (lv.size() == 0 || lv.size() > 2) throw new InternalExpressionException("'print' takes one or two arguments");
             ServerCommandSource s = ((CarpetContext)c).s;
-            MinecraftServer server = s.getMinecraftServer();
+            MinecraftServer server = s.getServer();
             Value res = lv.get(0);
             List<ServerPlayerEntity> targets = null;
             if (lv.size() == 2)
@@ -516,7 +516,7 @@ public class Auxiliary {
             if (lv.size() < 2) throw new InternalExpressionException("'display_title' needs at least a target, type and message, and optionally times");
             Value pVal = lv.get(0);
             if (!(pVal instanceof ListValue)) pVal = ListValue.of(pVal);
-            MinecraftServer server = ((CarpetContext)c).s.getMinecraftServer();
+            MinecraftServer server = ((CarpetContext)c).s.getServer();
             Stream<ServerPlayerEntity> targets = ((ListValue) pVal).getItems().stream().map(v ->
             {
                 ServerPlayerEntity player = EntityValue.getPlayerByValue(server, v);
@@ -590,7 +590,7 @@ public class Auxiliary {
                         map.put(target.getEntityName(), (BaseText) title);
                         total.getAndIncrement();
                     });
-                HUDController.update_hud(((CarpetContext)c).s.getMinecraftServer(), targetList);
+                HUDController.update_hud(((CarpetContext)c).s.getServer(), targetList);
                 return NumericValue.of(total.get());
             }
             TitleFadeS2CPacket timesPacket; // TimesPacket
@@ -630,7 +630,7 @@ public class Auxiliary {
             {
                 Text[] error = {null};
                 List<Text> output = new ArrayList<>();
-                Value retval = new NumericValue(s.getMinecraftServer().getCommandManager().execute(
+                Value retval = new NumericValue(s.getServer().getCommandManager().execute(
                         new SnoopyCommandSource(s, error, output),
                         lv.get(0).getString())
                 );
@@ -649,15 +649,15 @@ public class Auxiliary {
         expression.addContextFunction("save", 0, (c, t, lv) ->
         {
             ServerCommandSource s = ((CarpetContext)c).s;
-            s.getMinecraftServer().getPlayerManager().saveAllPlayerData();
-            s.getMinecraftServer().save(true,true,true);
+            s.getServer().getPlayerManager().saveAllPlayerData();
+            s.getServer().save(true,true,true);
             s.getWorld().getChunkManager().tick(() -> true);
             CarpetScriptServer.LOG.warn("Saved chunks");
             return Value.TRUE;
         });
 
         expression.addContextFunction("tick_time", 0, (c, t, lv) ->
-                new NumericValue(((CarpetContext) c).s.getMinecraftServer().getTicks()));
+                new NumericValue(((CarpetContext) c).s.getServer().getTicks()));
 
         expression.addContextFunction("world_time", 0, (c, t, lv) ->
                 new NumericValue(((CarpetContext) c).s.getWorld().getTime()));
@@ -678,9 +678,9 @@ public class Auxiliary {
         {
             //assuming we are in the tick world section
             // might be off one tick when run in the off tasks or asynchronously.
-            int currentReportedTick = ((CarpetContext) c).s.getMinecraftServer().getTicks()-1;
+            int currentReportedTick = ((CarpetContext) c).s.getServer().getTicks()-1;
             List<Value> ticks = new ArrayList<>(100);
-            final long[] tickArray = ((CarpetContext) c).s.getMinecraftServer().lastTickLengths;
+            final long[] tickArray = ((CarpetContext) c).s.getServer().lastTickLengths;
             for (int i=currentReportedTick+100; i > currentReportedTick; i--)
             {
                 ticks.add(new NumericValue(((double)tickArray[i % 100])/1000000.0));
@@ -692,12 +692,12 @@ public class Auxiliary {
         expression.addContextFunction("game_tick", -1, (c, t, lv) -> {
             CarpetContext cc = (CarpetContext)c;
             ServerCommandSource s = cc.s;
-            if (!s.getMinecraftServer().isOnThread()) throw new InternalExpressionException("Unable to run ticks from threads");
+            if (!s.getServer().isOnThread()) throw new InternalExpressionException("Unable to run ticks from threads");
             if (CarpetServer.scriptServer.tickDepth > 16) throw new InternalExpressionException("'game_tick' function caused other 'game_tick' functions to run. You should not allow that.");
             try
             {
                 CarpetServer.scriptServer.tickDepth ++;
-                ((MinecraftServerInterface) s.getMinecraftServer()).forceTick(() -> System.nanoTime() - CarpetServer.scriptServer.tickStart < 50000000L);
+                ((MinecraftServerInterface) s.getServer()).forceTick(() -> System.nanoTime() - CarpetServer.scriptServer.tickStart < 50000000L);
                 if (lv.size() > 0)
                 {
                     long ms_total = NumericValue.asNumber(lv.get(0)).getLong();
@@ -747,13 +747,13 @@ public class Auxiliary {
                 ValueConversions.of( ((CarpetContext)c).s.getWorld()));
 
         expression.addContextFunction("view_distance", 0, (c, t, lv) ->
-                new NumericValue(((CarpetContext)c).s.getMinecraftServer().getPlayerManager().getViewDistance()));
+                new NumericValue(((CarpetContext)c).s.getServer().getPlayerManager().getViewDistance()));
 
         // lazy due to passthrough and context changing ability
         expression.addLazyFunction("in_dimension", 2, (c, t, lv) -> {
             ServerCommandSource outerSource = ((CarpetContext)c).s;
             Value dimensionValue = lv.get(0).evalValue(c);
-            World world = ValueConversions.dimFromValue(dimensionValue, outerSource.getMinecraftServer());
+            World world = ValueConversions.dimFromValue(dimensionValue, outerSource.getServer());
             if (world == outerSource.getWorld()) return lv.get(1);
             ServerCommandSource innerSource = outerSource.withWorld((ServerWorld)world);
             Context newCtx = c.recreate();
@@ -791,7 +791,7 @@ public class Auxiliary {
                 throw new InternalExpressionException("'plop' needs extra argument indicating what to plop");
             String what = lv.get(locator.offset).getString();
             Value [] result = new Value[]{Value.NULL};
-            ((CarpetContext)c).s.getMinecraftServer().submitAndJoin( () ->
+            ((CarpetContext)c).s.getServer().submitAndJoin( () ->
             {
                 Boolean res = FeatureGenerator.plop(what, ((CarpetContext) c).s.getWorld(), locator.block.getPos());
 
@@ -969,7 +969,7 @@ public class Auxiliary {
         expression.addContextFunction("statistic", 3, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            ServerPlayerEntity player = EntityValue.getPlayerByValue(cc.s.getMinecraftServer(), lv.get(0));
+            ServerPlayerEntity player = EntityValue.getPlayerByValue(cc.s.getServer(), lv.get(0));
             if (player == null) return Value.NULL;
             Identifier category;
             Identifier statName;
@@ -1030,7 +1030,7 @@ public class Auxiliary {
         expression.addContextFunction("nbt_storage", -1, (c, t, lv) -> {
             if (lv.size() > 2) throw new InternalExpressionException("'nbt_storage' requires 0, 1 or 2 arguments.");
             CarpetContext cc = (CarpetContext) c;
-            DataCommandStorage storage = cc.s.getMinecraftServer().getDataCommandStorage();
+            DataCommandStorage storage = cc.s.getServer().getDataCommandStorage();
             if (lv.size() == 0)
                 return ListValue.wrap(storage.getIds().map(i -> new StringValue(nameFromRegistryId(i))).collect(Collectors.toList()));
             String key = lv.get(0).getString();
@@ -1049,7 +1049,7 @@ public class Auxiliary {
             CarpetContext cc = (CarpetContext)c;
             String origName = lv.get(0).getString();
             String name = InputValidator.validateSimpleString(origName, true);
-            MinecraftServer server = cc.s.getMinecraftServer();
+            MinecraftServer server = cc.s.getServer();
             for (String dpName : server.getDataPackManager().getNames())
             {
                 if (dpName.equalsIgnoreCase("file/"+name+".zip") ||
@@ -1114,7 +1114,7 @@ public class Auxiliary {
         expression.addContextFunction("enable_hidden_dimensions", 0, (c, t, lv) -> {
             CarpetContext cc = (CarpetContext)c;
             // from minecraft.server.Main.main
-            MinecraftServer server = cc.s.getMinecraftServer();
+            MinecraftServer server = cc.s.getServer();
             LevelStorage.Session session = ((MinecraftServerInterface)server).getCMSession();
             DataPackSettings dataPackSettings = session.getDataPackSettings();
             ResourcePackManager resourcePackManager = server.getDataPackManager();

src/main/java/carpet/script/api/Entities.java

@@ -48,7 +48,7 @@ public class Entities {
                 CarpetContext cc = (CarpetContext)c;
                 if (cc.host.user != null)
                 {
-                    ServerPlayerEntity player = cc.s.getMinecraftServer().getPlayerManager().getPlayer(cc.host.user);
+                    ServerPlayerEntity player = cc.s.getServer().getPlayerManager().getPlayer(cc.host.user);
                     return EntityValue.of(player);
                 }
                 Entity callingEntity = cc.s.getEntity();
@@ -62,7 +62,7 @@ public class Entities {
             if ("all".equalsIgnoreCase(playerName))
             {
                 retval = ListValue.wrap(
-                        ((CarpetContext)c).s.getMinecraftServer().getPlayerManager().getPlayerList().
+                        ((CarpetContext)c).s.getServer().getPlayerManager().getPlayerList().
                                 stream().map(EntityValue::new).collect(Collectors.toList()));
             }
             else if ("*".equalsIgnoreCase(playerName))
@@ -97,7 +97,7 @@ public class Entities {
             }
             else
             {
-                ServerPlayerEntity player = ((CarpetContext) c).s.getMinecraftServer().getPlayerManager().getPlayer(playerName);
+                ServerPlayerEntity player = ((CarpetContext) c).s.getServer().getPlayerManager().getPlayer(playerName);
                 if (player != null)
                     retval = new EntityValue(player);
             }
@@ -167,7 +167,7 @@ public class Entities {
         {
             String who = lv.get(0).getString();
             ServerCommandSource source = ((CarpetContext)c).s;
-            EntityValue.EntityClassDescriptor eDesc = EntityValue.getEntityDescriptor(who, source.getMinecraftServer());
+            EntityValue.EntityClassDescriptor eDesc = EntityValue.getEntityDescriptor(who, source.getServer());
             List<? extends Entity> entityList = source.getWorld().getEntitiesByType(eDesc.directType, eDesc.filteringPredicate);
             return ListValue.wrap(entityList.stream().map(EntityValue::new).collect(Collectors.toList()));
         });
@@ -195,7 +195,7 @@ public class Entities {
                 throw new InternalExpressionException("Range of 'entity_area' cannot come from a block argument");
             Vec3d range = rangeLocator.vec;
             Box area = centerBox.expand(range.x, range.y, range.z);
-            EntityValue.EntityClassDescriptor eDesc = EntityValue.getEntityDescriptor(who, cc.s.getMinecraftServer());
+            EntityValue.EntityClassDescriptor eDesc = EntityValue.getEntityDescriptor(who, cc.s.getServer());
             List<? extends Entity> entityList = cc.s.getWorld().getEntitiesByType(eDesc.directType, area,eDesc.filteringPredicate);
             return ListValue.wrap(entityList.stream().map(EntityValue::new).collect(Collectors.toList()));
         });
@@ -257,7 +257,7 @@ public class Entities {
         {
             if (lv.size() > 1) throw new InternalExpressionException("'entity_types' requires one or no arguments");
             String desc = (lv.size() == 1)?lv.get(0).getString():"*";
-            return EntityValue.getEntityDescriptor(desc, ((CarpetContext) c).s.getMinecraftServer()).listValue;
+            return EntityValue.getEntityDescriptor(desc, ((CarpetContext) c).s.getServer()).listValue;
         });
 
         expression.addContextFunction("entity_load_handler", -1, (c, t, lv) ->
@@ -269,7 +269,7 @@ public class Entities {
                     ? ((ListValue) entityValue).getItems().stream().map(Value::getString).collect(Collectors.toList())
                     : Collections.singletonList(entityValue.getString());
             Set<EntityType<? extends Entity>> types = new HashSet<>();
-            descriptors.forEach(s -> types.addAll(EntityValue.getEntityDescriptor(s, ((CarpetContext) c).s.getMinecraftServer()).typeList));
+            descriptors.forEach(s -> types.addAll(EntityValue.getEntityDescriptor(s, ((CarpetContext) c).s.getServer()).typeList));
             FunctionArgument funArg = FunctionArgument.findIn(c, expression.module, lv, 1, true, false);
             CarpetEventServer events = ((CarpetScriptHost)c.host).getScriptServer().events;
             if (funArg.function == null)

src/main/java/carpet/script/api/Inventories.java

@@ -65,7 +65,7 @@ public class Inventories {
             if (lv.size() == 0)
                 return ListValue.wrap(Registry.ITEM.getIds().stream().map(ValueConversions::of).collect(Collectors.toList()));
             CarpetContext cc = (CarpetContext)c;
-            TagManager tagManager = cc.s.getMinecraftServer().getTagManager();
+            TagManager tagManager = cc.s.getServer().getTagManager();
             String tag = lv.get(0).getString();
             net.minecraft.tag.Tag<Item> itemTag = tagManager.getOrCreateTagGroup(Registry.ITEM_KEY).getTag(new Identifier(tag));
             if (itemTag == null) return Value.NULL;
@@ -75,7 +75,7 @@ public class Inventories {
         expression.addContextFunction("item_tags", -1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            TagManager tagManager = cc.s.getMinecraftServer().getTagManager();
+            TagManager tagManager = cc.s.getServer().getTagManager();
             if (lv.size() == 0)
                 return ListValue.wrap(tagManager.getOrCreateTagGroup(Registry.ITEM_KEY).getTagIds().stream().map(ValueConversions::of).collect(Collectors.toList()));
             Item item = NBTSerializableValue.parseItem(lv.get(0).getString()).getItem();
@@ -106,7 +106,7 @@ public class Inventories {
                 }
             }
             List<Recipe<?>> recipes;
-            recipes = ((RecipeManagerInterface) cc.s.getMinecraftServer().getRecipeManager()).getAllMatching(type, new Identifier(recipeName));
+            recipes = ((RecipeManagerInterface) cc.s.getServer().getRecipeManager()).getAllMatching(type, new Identifier(recipeName));
             if (recipes.isEmpty())
                 return Value.NULL;
             List<Value> recipesOutput = new ArrayList<>();

src/main/java/carpet/script/api/Scoreboards.java

@@ -69,7 +69,7 @@ public class Scoreboards {
         expression.addContextFunction("scoreboard", -1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            Scoreboard scoreboard =  cc.s.getMinecraftServer().getScoreboard();
+            Scoreboard scoreboard =  cc.s.getServer().getScoreboard();
             if (lv.size()==0)
                 return ListValue.wrap(scoreboard.getObjectiveNames().stream().map(StringValue::new).collect(Collectors.toList()));
             String objectiveName = lv.get(0).getString();
@@ -102,7 +102,7 @@ public class Scoreboards {
         {
             if (lv.size()==0) throw new InternalExpressionException("'scoreboard_remove' requires at least one parameter");
             CarpetContext cc = (CarpetContext)c;
-            Scoreboard scoreboard =  cc.s.getMinecraftServer().getScoreboard();
+            Scoreboard scoreboard =  cc.s.getServer().getScoreboard();
             String objectiveName = lv.get(0).getString();
             ScoreboardObjective objective = scoreboard.getObjective(objectiveName);
             if (objective == null) return Value.FALSE;
@@ -125,7 +125,7 @@ public class Scoreboards {
         expression.addContextFunction("scoreboard_add", -1, (c, t, lv)->
         {
             CarpetContext cc = (CarpetContext)c;
-            Scoreboard scoreboard =  cc.s.getMinecraftServer().getScoreboard();
+            Scoreboard scoreboard =  cc.s.getServer().getScoreboard();
             if (lv.size() == 0 || lv.size()>2) throw new InternalExpressionException("'scoreboard_add' should have one or two parameters");
             String objectiveName = lv.get(0).getString();
             ScoreboardCriterion criterion;
@@ -163,7 +163,7 @@ public class Scoreboards {
         {
             if(lv.size() < 2) throw new InternalExpressionException("'scoreboard_property' requires at least two parameters");
             CarpetContext cc = (CarpetContext)c;
-            Scoreboard scoreboard =  cc.s.getMinecraftServer().getScoreboard();
+            Scoreboard scoreboard =  cc.s.getServer().getScoreboard();
             ScoreboardObjective objective = scoreboard.getObjective(lv.get(0).getString());
             if(objective == null) return Value.NULL;
 
@@ -228,7 +228,7 @@ public class Scoreboards {
         expression.addContextFunction("scoreboard_display", 2, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            Scoreboard scoreboard =  cc.s.getMinecraftServer().getScoreboard();
+            Scoreboard scoreboard =  cc.s.getServer().getScoreboard();
             String location = lv.get(0).getString();
             int slot = Scoreboard.getDisplaySlotId(location);
             if (slot < 0) throw new InternalExpressionException("Invalid objective slot: "+location);
@@ -249,7 +249,7 @@ public class Scoreboards {
         {
             if(lv.size() > 1) throw new InternalExpressionException("'team_list' requires zero or one parameters");
             CarpetContext cc = (CarpetContext)c;
-            ServerScoreboard scoreboard = cc.s.getMinecraftServer().getScoreboard();
+            ServerScoreboard scoreboard = cc.s.getServer().getScoreboard();
             if(lv.size() == 0)
                 return ListValue.wrap(scoreboard.getTeamNames().stream().map(StringValue::of).collect(Collectors.toList()));
             if (lv.size() != 1) return Value.NULL;
@@ -264,7 +264,7 @@ public class Scoreboards {
             if(!(lv.size() < 3 && lv.size() > 0)) throw new InternalExpressionException("'team_add' requires one or two parameters");
 
             CarpetContext cc = (CarpetContext)c;
-            ServerScoreboard scoreboard = cc.s.getMinecraftServer().getScoreboard();
+            ServerScoreboard scoreboard = cc.s.getServer().getScoreboard();
             String teamName = lv.get(0).getString();
 
             if(lv.size() == 1)
@@ -287,7 +287,7 @@ public class Scoreboards {
         expression.addContextFunction("team_remove", 1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            ServerScoreboard scoreboard = cc.s.getMinecraftServer().getScoreboard();
+            ServerScoreboard scoreboard = cc.s.getServer().getScoreboard();
             Value teamVal = lv.get(0);
             String team = teamVal.getString();
             if(scoreboard.getTeam(team) == null) return Value.NULL;
@@ -299,7 +299,7 @@ public class Scoreboards {
         expression.addContextFunction("team_leave", 1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            ServerScoreboard scoreboard = cc.s.getMinecraftServer().getScoreboard();
+            ServerScoreboard scoreboard = cc.s.getServer().getScoreboard();
             Value playerVal = lv.get(0);
             String player = EntityValue.getPlayerNameByValue(playerVal);
             if(player == null) return Value.NULL;
@@ -309,7 +309,7 @@ public class Scoreboards {
         expression.addContextFunction("team_property", -1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            ServerScoreboard scoreboard = cc.s.getMinecraftServer().getScoreboard();
+            ServerScoreboard scoreboard = cc.s.getServer().getScoreboard();
 
             if(lv.size() < 2 || lv.size() > 3) throw new InternalExpressionException("'team_property' requires two or three arguments");
 
@@ -400,7 +400,7 @@ public class Scoreboards {
 
         expression.addContextFunction("bossbar", -1, (c, t, lv) ->
         {
-            BossBarManager bossBarManager = ((CarpetContext)c).s.getMinecraftServer().getBossBarManager();
+            BossBarManager bossBarManager = ((CarpetContext)c).s.getServer().getBossBarManager();
             if(lv.size() > 3) throw new InternalExpressionException("'bossbar' accepts max three arguments");
 
             if(lv.size() == 0) return ListValue.wrap(bossBarManager.getAll().stream().map(CommandBossBar::getId).map(Identifier::toString).map(StringValue::of).collect(Collectors.toList()));
@@ -457,13 +457,13 @@ public class Scoreboards {
 
                     if(propertyValue instanceof ListValue) {
                         ((ListValue) propertyValue).getItems().forEach((v)->{
-                            ServerPlayerEntity player = EntityValue.getPlayerByValue(((CarpetContext)c).s.getMinecraftServer(),propertyValue);
+                            ServerPlayerEntity player = EntityValue.getPlayerByValue(((CarpetContext)c).s.getServer(),propertyValue);
                             if(player != null) bossBar.addPlayer(player);
                         });
                         return Value.TRUE;
                     }
 
-                    ServerPlayerEntity player = EntityValue.getPlayerByValue(((CarpetContext) c).s.getMinecraftServer(), propertyValue);
+                    ServerPlayerEntity player = EntityValue.getPlayerByValue(((CarpetContext) c).s.getServer(), propertyValue);
                     if(player != null) {
                         bossBar.addPlayer(player);
                         return Value.TRUE;
@@ -475,14 +475,14 @@ public class Scoreboards {
                     {
                         bossBar.clearPlayers();
                         ((ListValue) propertyValue).getItems().forEach((v) -> {
-                            ServerPlayerEntity p = EntityValue.getPlayerByValue(((CarpetContext) c).s.getMinecraftServer(), v);
+                            ServerPlayerEntity p = EntityValue.getPlayerByValue(((CarpetContext) c).s.getServer(), v);
                             if (p != null) bossBar.addPlayer(p);
                         });
                         return Value.TRUE;
                     }
 
 
-                    ServerPlayerEntity p = EntityValue.getPlayerByValue(((CarpetContext) c).s.getMinecraftServer(), propertyValue);
+                    ServerPlayerEntity p = EntityValue.getPlayerByValue(((CarpetContext) c).s.getServer(), propertyValue);
                     bossBar.clearPlayers();
                     if (p != null) {
                         bossBar.addPlayer(p);

src/main/java/carpet/script/api/Threading.java

@@ -16,7 +16,7 @@ public class Threading
     {
         //"overidden" native call to cancel if on main thread
         expression.addContextFunction("task_join", 1, (c, t, lv) -> {
-            if (((CarpetContext)c).s.getMinecraftServer().isOnThread())
+            if (((CarpetContext)c).s.getServer().isOnThread())
                 throw new InternalExpressionException("'task_join' cannot be called from main thread to avoid deadlocks");
             Value v = lv.get(0);
             if (!(v instanceof ThreadValue))
@@ -27,13 +27,13 @@ public class Threading
         // has to be lazy due to deferred execution of the expression
         expression.addLazyFunctionWithDelegation("task_dock", 1, false,true, (c, t, expr, tok, lv) -> {
             CarpetContext cc = (CarpetContext)c;
-            MinecraftServer server = cc.s.getMinecraftServer();
+            MinecraftServer server = cc.s.getServer();
             if (server.isOnThread()) return lv.get(0); // pass through for on thread tasks
             Value[] result = new Value[]{Value.NULL};
             RuntimeException[] internal = new RuntimeException[]{null};
             try
             {
-                ((CarpetContext) c).s.getMinecraftServer().submitAndJoin(() ->
+                ((CarpetContext) c).s.getServer().submitAndJoin(() ->
                 {
                     try
                     {

src/main/java/carpet/script/api/WorldAccess.java

@@ -692,7 +692,7 @@ public class WorldAccess {
             boolean previous = CarpetSettings.impendingFillSkipUpdates.get();
             if (previous) return lv.get(0);
             Value [] result = new Value[]{Value.NULL};
-            ((CarpetContext)c).s.getMinecraftServer().submitAndJoin( () ->
+            ((CarpetContext)c).s.getServer().submitAndJoin( () ->
             {
                 try
                 {
@@ -781,7 +781,7 @@ public class WorldAccess {
             BlockState finalSourceBlockState = sourceBlockState;
             BlockPos targetPos = targetLocator.block.getPos();
             Boolean[] result = new Boolean[]{true};
-            cc.s.getMinecraftServer().submitAndJoin( () ->
+            cc.s.getServer().submitAndJoin( () ->
             {
                 Clearable.clear(world.getBlockEntity(targetPos));
                 boolean success = world.setBlockState(targetPos, finalSourceBlockState, 2);
@@ -1135,7 +1135,7 @@ public class WorldAccess {
             if (lv.size() == 0)
                 return ListValue.wrap(Registry.BLOCK.getIds().stream().map(ValueConversions::of).collect(Collectors.toList()));
             CarpetContext cc = (CarpetContext)c;
-            TagManager tagManager = cc.s.getMinecraftServer().getTagManager();
+            TagManager tagManager = cc.s.getServer().getTagManager();
             String tag = lv.get(0).getString();
             net.minecraft.tag.Tag<Block> blockTag = tagManager.getOrCreateTagGroup(Registry.BLOCK_KEY).getTag(new Identifier(tag));
             if (blockTag == null) return Value.NULL;
@@ -1145,7 +1145,7 @@ public class WorldAccess {
         expression.addContextFunction("block_tags", -1, (c, t, lv) ->
         {
             CarpetContext cc = (CarpetContext)c;
-            TagManager tagManager = cc.s.getMinecraftServer().getTagManager();
+            TagManager tagManager = cc.s.getServer().getTagManager();
             if (lv.size() == 0)
                 return ListValue.wrap(tagManager.getOrCreateTagGroup(Registry.BLOCK_KEY).getTagIds().stream().map(ValueConversions::of).collect(Collectors.toList()));
             BlockArgument blockLocator = BlockArgument.findIn(cc, lv, 0, true);
@@ -1182,7 +1182,7 @@ public class WorldAccess {
             // in locatebiome
             if (locator.offset == lv.size())
             {
-                Identifier biomeId = cc.s.getMinecraftServer().getRegistryManager().get(Registry.BIOME_KEY).getId(biome);
+                Identifier biomeId = cc.s.getServer().getRegistryManager().get(Registry.BIOME_KEY).getId(biome);
                 return new StringValue(NBTSerializableValue.nameFromRegistryId(biomeId));
             }
             String biomeFeature = lv.get(locator.offset).getString();
@@ -1199,7 +1199,7 @@ public class WorldAccess {
                 throw new InternalExpressionException("'set_biome' needs a biome name as an argument");
             String biomeName = lv.get(locator.offset+0).getString();
             // from locatebiome command code
-            Biome biome = cc.s.getMinecraftServer().getRegistryManager().get(Registry.BIOME_KEY).getOrEmpty(new Identifier(biomeName))
+            Biome biome = cc.s.getServer().getRegistryManager().get(Registry.BIOME_KEY).getOrEmpty(new Identifier(biomeName))
                 .orElseThrow(() -> new ThrowStatement(biomeName, Throwables.UNKNOWN_BIOME));
             boolean doImmediateUpdate = true;
             if (lv.size() > locator.offset+1)
@@ -1218,7 +1218,7 @@ public class WorldAccess {
             CarpetContext cc = (CarpetContext)c;
             BlockPos pos = BlockArgument.findIn(cc, lv, 0).block.getPos();
             ServerWorld world = cc.s.getWorld();
-            cc.s.getMinecraftServer().submitAndJoin( () -> WorldTools.forceChunkUpdate(pos, world));
+            cc.s.getServer().submitAndJoin( () -> WorldTools.forceChunkUpdate(pos, world));
             return Value.TRUE;
         });
 
@@ -1345,7 +1345,7 @@ public class WorldAccess {
             // good 'ol pointer
             Value[] result = new Value[]{Value.NULL};
             // technically a world modification. Even if we could let it slide, we will still park it
-            ((CarpetContext) c).s.getMinecraftServer().submitAndJoin(() ->
+            ((CarpetContext) c).s.getServer().submitAndJoin(() ->
             {
                 Map<StructureFeature<?>, StructureStart<?>> structures = world.getChunk(pos).getStructureStarts();
                 if (lv.size() == locator.offset + 1)
@@ -1407,7 +1407,7 @@ public class WorldAccess {
                 }
             }
 
-            boolean success = WorldTools.createWorld(cc.s.getMinecraftServer(), worldKey, seed);
+            boolean success = WorldTools.createWorld(cc.s.getServer(), worldKey, seed);
             if (!success) return Value.FALSE;
             CarpetServer.settingsManager.notifyPlayersCommandsChanged();
             return Value.TRUE;
@@ -1466,7 +1466,7 @@ public class WorldAccess {
 
             Value [] result = new Value[]{Value.NULL};
 
-            ((CarpetContext)c).s.getMinecraftServer().submitAndJoin( () ->
+            ((CarpetContext)c).s.getServer().submitAndJoin( () ->
             {
                 Map<String, Integer> report = ((ThreadedAnvilChunkStorageInterface) world.getChunkManager().threadedAnvilChunkStorage).regenerateChunkRegion(requestedChunks);
                 /*for (ChunkPos chpos: requestedChunks) // needed in 1.16 only