1.20.4

Author: extclp

src/main/java/carpet/CarpetExtension.java

@@ -1,6 +1,5 @@
 package carpet;
 
-import carpet.script.CarpetExpression;
 import carpet.api.settings.SettingsManager;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.commands.CommandBuildContext;
@@ -150,21 +149,4 @@ default void registerLoggers() {}
      */
     default Map<String, String> canHasTranslations(String lang) { return Collections.emptyMap();}
 
-    /**
-     * Handles each call that creates / parses the scarpet expression.
-     * Extensions can add their own built-in functions here.
-     *
-     * Events such as generic events or entity events, can be added statically
-     * by creating new events as
-     *
-     * CarpetEventServer.Event class: to handle `__on_foo()` type of call definitions
-     *
-     * or
-     *
-     * EntityEventsGroup.Event class: to handle `entity_event('foo', ...)` type of events
-     *
-     * @param expression Passed {@link CarpetExpression} to add built-in functions to
-     */
-    default void scarpetApi(CarpetExpression expression) {}
-
 }

src/main/java/carpet/CarpetServer.java

@@ -15,17 +15,13 @@
 import carpet.commands.PerimeterInfoCommand;
 import carpet.commands.PlayerCommand;
 import carpet.commands.ProfileCommand;
-import carpet.script.ScriptCommand;
 import carpet.commands.SpawnCommand;
 import carpet.commands.TestCommand;
 import carpet.network.ServerNetworkHandler;
 import carpet.helpers.HopperCounter;
 import carpet.logging.LoggerRegistry;
-import carpet.script.CarpetScriptServer;
 import carpet.api.settings.SettingsManager;
 import carpet.logging.HUDController;
-import carpet.script.external.Carpet;
-import carpet.script.external.Vanilla;
 import carpet.script.utils.ParticleParser;
 import carpet.utils.MobAI;
 import carpet.utils.SpawnReporter;
@@ -43,7 +39,6 @@
 public class CarpetServer // static for now - easier to handle all around the code, its one anyways
 {
     public static MinecraftServer minecraft_server;
-    public static CarpetScriptServer scriptServer;
     public static carpet.settings.SettingsManager settingsManager; // to change type to api type, can't change right now because of binary and source compat
     public static final List<CarpetExtension> extensions = new ArrayList<>();
 
@@ -75,7 +70,6 @@ public static void onGameStarted()
         settingsManager.parseSettingsClass(CarpetSettings.class);
         extensions.forEach(CarpetExtension::onGameStarted);
         //FabricAPIHooks.initialize();
-        CarpetScriptServer.parseFunctionClasses();
     }
 
     public static void onServerLoaded(MinecraftServer server)
@@ -86,8 +80,6 @@ public static void onServerLoaded(MinecraftServer server)
 
         forEachManager(sm -> sm.attachServer(server));
         extensions.forEach(e -> e.onServerLoaded(server));
-        scriptServer = new CarpetScriptServer(server);
-        Carpet.MinecraftServer_addScriptServer(server, scriptServer);
         MobAI.resetTrackers();
         LoggerRegistry.initLoggers();
         //TickSpeed.reset();
@@ -97,15 +89,11 @@ public static void onServerLoadedWorlds(MinecraftServer minecraftServer)
     {
         HopperCounter.resetAll(minecraftServer, true);
         extensions.forEach(e -> e.onServerLoadedWorlds(minecraftServer));
-        // initialize scarpet rules after all extensions are loaded
-        forEachManager(SettingsManager::initializeScarpetRules);
-        scriptServer.initializeForWorld();
     }
 
     public static void tick(MinecraftServer server)
     {
         HUDController.update_hud(server, null);
-        if (scriptServer != null) scriptServer.tick();
 
         //in case something happens
         CarpetSettings.impendingFillSkipUpdates.set(false);
@@ -130,7 +118,6 @@ public static void registerCarpetCommands(CommandDispatcher<CommandSourceStack>
         DistanceCommand.register(dispatcher, commandBuildContext);
         PerimeterInfoCommand.register(dispatcher, commandBuildContext);
         DrawCommand.register(dispatcher, commandBuildContext);
-        ScriptCommand.register(dispatcher, commandBuildContext);
         MobAICommand.register(dispatcher, commandBuildContext);
         // registering command of extensions that has registered before either server is created
         // for all other, they will have them registered when they add themselves
@@ -151,25 +138,17 @@ public static void onPlayerLoggedIn(ServerPlayer player)
         ServerNetworkHandler.onPlayerJoin(player);
         LoggerRegistry.playerConnected(player);
         extensions.forEach(e -> e.onPlayerLoggedIn(player));
-        scriptServer.onPlayerJoin(player);
     }
 
     public static void onPlayerLoggedOut(ServerPlayer player, Component reason)
     {
         ServerNetworkHandler.onPlayerLoggedOut(player);
         LoggerRegistry.playerDisconnected(player);
         extensions.forEach(e -> e.onPlayerLoggedOut(player));
-        // first case client, second case server
-        CarpetScriptServer runningScriptServer = (player.getServer() == null) ? scriptServer : Vanilla.MinecraftServer_getScriptServer(player.getServer());
-        if (runningScriptServer != null && !runningScriptServer.stopAll) {
-            runningScriptServer.onPlayerLoggedOut(player, reason);
-        }
     }
 
     public static void clientPreClosing()
     {
-        if (scriptServer != null) scriptServer.onClose();
-        scriptServer = null;
     }
 
     public static void onServerClosed(MinecraftServer server)
@@ -178,13 +157,6 @@ public static void onServerClosed(MinecraftServer server)
         // so we allow to pass multiple times gating it only on existing server ref
         if (minecraft_server != null)
         {
-            if (scriptServer != null) scriptServer.onClose();
-            // this is a mess, will cleanip onlly when global reference is gone
-            if (!Vanilla.MinecraftServer_getScriptServer(server).stopAll) {
-                Vanilla.MinecraftServer_getScriptServer(server).onClose();
-            }
-
-            scriptServer = null;
             ServerNetworkHandler.close();
 
             LoggerRegistry.stopLoggers();
@@ -221,7 +193,6 @@ public static void registerExtensionLoggers()
 
     public static void onReload(MinecraftServer server)
     {
-        scriptServer.reload(server);
         extensions.forEach(e -> e.onReload(server));
     }
 

src/main/java/carpet/CarpetSettings.java

@@ -4,7 +4,6 @@
 import carpet.api.settings.RuleCategory;
 import carpet.api.settings.Validators;
 import carpet.api.settings.Validator;
-import carpet.script.utils.AppStoreManager;
 import carpet.settings.Rule;
 import carpet.utils.Translations;
 import carpet.utils.CommandHelper;
@@ -51,7 +50,6 @@ public class CarpetSettings
     public static final String carpetVersion = FabricLoader.getInstance().getModContainer("carpet").orElseThrow().getMetadata().getVersion().toString();
     public static final String releaseTarget = "1.20.3";
     public static final Logger LOG = LoggerFactory.getLogger("carpet");
-    public static final ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
     public static final ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);
     public static int runPermissionLevel = 2;
     public static Block structureBlockIgnoredBlock = Blocks.STRUCTURE_VOID;
@@ -463,105 +461,6 @@ public boolean enabled() {
     @Rule(desc = "Enables /draw commands", extra = {"... allows for drawing simple shapes or","other shapes which are sorta difficult to do normally"}, category = COMMAND)
     public static String commandDraw = "ops";
 
-
-    @Rule(
-            desc = "Enables /script command",
-            extra = "An in-game scripting API for Scarpet programming language",
-            category = {COMMAND, SCARPET}
-    )
-    public static String commandScript = "true";
-
-    private static class ModulePermissionLevel extends Validator<String> {
-        @Override public String validate(CommandSourceStack source, CarpetRule<String> currentRule, String newValue, String string) {
-            int permissionLevel = switch (newValue) {
-                    case "false" -> 0;
-                    case "true", "ops" -> 2;
-                    case "0", "1", "2", "3", "4" -> Integer.parseInt(newValue);
-                    default -> throw new IllegalArgumentException(); // already checked by previous validator
-            	};
-            if (source != null && !source.hasPermission(permissionLevel))
-                return null;
-            CarpetSettings.runPermissionLevel = permissionLevel;
-            if (source != null)
-                CommandHelper.notifyPlayersCommandsChanged(source.getServer());
-            return newValue;
-        }
-        @Override
-        public String description() { return "When changing the rule, you must at least have the permission level you are trying to give it";}
-    }
-    @Rule(
-            desc = "Enables restrictions for arbitrary code execution with scarpet",
-            extra = {
-                    "Users that don't have this permission level",
-                    "won't be able to load apps or /script run.",
-                    "It is also the permission level apps will",
-                    "have when running commands with run()"
-            },
-            category = {SCARPET},
-            options = {"ops", "0", "1", "2", "3", "4"},
-            validate = {Validators.CommandLevel.class, ModulePermissionLevel.class}
-    )
-    public static String commandScriptACE = "ops";
-
-    @Rule(
-            desc = "Scarpet script from world files will autoload on server/world start ",
-            extra = "if /script is enabled",
-            category = SCARPET
-    )
-    public static boolean scriptsAutoload = true;
-
-    @Rule(
-            desc = "Enables scripts debugging messages in system log",
-            category = SCARPET
-    )
-    public static boolean scriptsDebugging = false;
-
-    @Rule(
-            desc = "Enables scripts optimization",
-            category = SCARPET
-    )
-    public static boolean scriptsOptimization = true;
-
-    private static class ScarpetAppStore extends Validator<String> {
-        @Override
-        public String validate(CommandSourceStack source, CarpetRule<String> currentRule, String newValue, String stringInput) {
-            if (newValue.equals(currentRule.value())) {
-                // Don't refresh the local repo if it's the same (world change), helps preventing hitting rate limits from github when
-                // getting suggestions. Pending is a way to invalidate the cache when it gets old, and investigating api usage further
-                return newValue;
-            }
-            if (newValue.equals("none")) {
-                AppStoreManager.setScarpetRepoLink(null);
-            } else {
-                if (newValue.endsWith("/"))
-                    newValue = newValue.substring(0, newValue.length() - 1);
-                AppStoreManager.setScarpetRepoLink("https://api.github.com/repos/" + newValue + "/");
-            }
-            if (source != null)
-                CommandHelper.notifyPlayersCommandsChanged(source.getServer());
-            return newValue;
-        }
-
-        @Override
-        public String description() {
-            return "Appstore link should point to a valid github repository";
-        }
-    }
-
-    @Rule(
-            desc = "Location of the online repository of scarpet apps",
-            extra = {
-                    "set to 'none' to disable.",
-                    "Point to any github repo with scarpet apps",
-                    "using <user>/<repo>/contents/<path...>"
-            },
-            category = SCARPET,
-            strict = false,
-            validate = ScarpetAppStore.class
-    )
-    public static String scriptsAppStore = "gnembon/scarpet/contents/programs";
-
-
     @Rule(desc = "Enables /player command to control/spawn players", category = COMMAND)
     public static String commandPlayer = "ops";
 

src/main/java/carpet/api/settings/SettingsManager.java

@@ -262,7 +262,6 @@ public void notifyRuleChanged(CommandSourceStack source, CarpetRule<?> rule, Str
         observers.forEach(observer -> observer.ruleChanged(source, rule, userInput));
         staticObservers.forEach(observer -> observer.ruleChanged(source, rule, userInput));
         ServerNetworkHandler.updateRuleWithConnectedClients(rule);
-        switchScarpetRuleIfNeeded(source, rule); //TODO move into rule
     }
 
     /**
@@ -287,19 +286,6 @@ public void detachServer()
         for (CarpetRule<?> rule : rules.values()) RuleHelper.resetToDefault(rule, null);
         server = null;
     }
-    
-    /**
-     * <p>Initializes Scarpet rules in this {@link SettingsManager}, if any.</p>
-     * <p>This is handled automatically by Carpet and calling it is not supported.</p>
-     */
-    public void initializeScarpetRules() { //TODO try remove
-        for (CarpetRule<?> rule : rules.values())
-        {
-            if (rule instanceof ParsedRule<?> pr && !pr.scarpetApp.isEmpty()) {
-                switchScarpetRuleIfNeeded(server.createCommandSourceStack(), pr);
-            }
-        }
-    }
 
     /**
      * Calling this method is not supported.
@@ -324,19 +310,6 @@ public void inspectClientsideCommand(CommandSourceStack source, String string)
             }
         }
     }
-    
-    private void switchScarpetRuleIfNeeded(CommandSourceStack source, CarpetRule<?> carpetRule) //TODO remove. This should be handled by the rule
-    {
-        if (carpetRule instanceof ParsedRule<?> rule && !rule.scarpetApp.isEmpty() && CarpetServer.scriptServer != null) // null check because we may be in server init
-        {
-            if (RuleHelper.getBooleanValue(rule) || (rule.type() == String.class && !rule.value().equals("false")))
-            {
-                CarpetServer.scriptServer.addScriptHost(source, rule.scarpetApp, s -> CommandHelper.canUseCommand(s, rule.value()), false, false, true, null);
-            } else {
-                CarpetServer.scriptServer.removeScriptHost(source, rule.scarpetApp, false, true);
-            }
-        }
-    }
 
     private Path getFile()
     {