1.19.2

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;
@@ -152,21 +151,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

@@ -14,18 +14,15 @@
 import carpet.commands.PerimeterInfoCommand;
 import carpet.commands.PlayerCommand;
 import carpet.commands.ProfileCommand;
-import carpet.commands.ScriptCommand;
 import carpet.commands.SpawnCommand;
 import carpet.commands.TestCommand;
 import carpet.commands.TickCommand;
 import carpet.network.ServerNetworkHandler;
 import carpet.helpers.HopperCounter;
 import carpet.helpers.TickSpeed;
 import carpet.logging.LoggerRegistry;
-import carpet.script.CarpetScriptServer;
 import carpet.api.settings.SettingsManager;
 import carpet.logging.HUDController;
-import carpet.utils.FabricAPIHooks;
 import carpet.utils.MobAI;
 import carpet.utils.SpawnReporter;
 import com.mojang.brigadier.CommandDispatcher;
@@ -42,7 +39,6 @@ public class CarpetServer // static for now - easier to handle all around the co
 {
     public static MinecraftServer minecraft_server;
     private static CommandDispatcher<CommandSourceStack> currentCommandDispatcher;
-    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<>();
 
@@ -80,8 +76,6 @@ public static void onGameStarted()
         settingsManager = new carpet.settings.SettingsManager(CarpetSettings.carpetVersion, "carpet", "Carpet Mod");
         settingsManager.parseSettingsClass(CarpetSettings.class);
         extensions.forEach(CarpetExtension::onGameStarted);
-        FabricAPIHooks.initialize();
-        CarpetScriptServer.parseFunctionClasses();
     }
 
     public static void onServerLoaded(MinecraftServer server)
@@ -96,7 +90,6 @@ public static void onServerLoaded(MinecraftServer server)
             if (sm != null) sm.attachServer(server);
             e.onServerLoaded(server);
         });
-        scriptServer = new CarpetScriptServer(server);
         MobAI.resetTrackers();
         LoggerRegistry.initLoggers();
         //TickSpeed.reset();
@@ -106,14 +99,12 @@ public static void onServerLoadedWorlds(MinecraftServer minecraftServer)
     {
         HopperCounter.resetAll(minecraftServer, true);
         extensions.forEach(e -> e.onServerLoadedWorlds(minecraftServer));
-        scriptServer.initializeForWorld();
     }
 
     public static void tick(MinecraftServer server)
     {
         TickSpeed.tick();
         HUDController.update_hud(server, null);
-        if (scriptServer != null) scriptServer.tick();
 
         //in case something happens
         CarpetSettings.impendingFillSkipUpdates.set(false);
@@ -142,7 +133,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
@@ -163,7 +153,6 @@ public static void onPlayerLoggedIn(ServerPlayer player)
     {
         ServerNetworkHandler.onPlayerJoin(player);
         LoggerRegistry.playerConnected(player);
-        scriptServer.onPlayerJoin(player);
         extensions.forEach(e -> e.onPlayerLoggedIn(player));
 
     }
@@ -177,8 +166,6 @@ public static void onPlayerLoggedOut(ServerPlayer player)
 
     public static void clientPreClosing()
     {
-        if (scriptServer != null) scriptServer.onClose();
-        scriptServer = null;
     }
 
     public static void onServerClosed(MinecraftServer server)
@@ -187,8 +174,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();
-            scriptServer = null;
             ServerNetworkHandler.close();
             currentCommandDispatcher = null;
 
@@ -217,7 +202,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;
@@ -49,7 +48,6 @@ public class CarpetSettings
 {
     public static final String carpetVersion = "1.4.84+v221018";
     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 boolean doChainStone = false;
@@ -473,88 +471,6 @@ private static class ChainStoneSetting extends Validator<String> {
 
     @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":
-                        yield 0;
-                    case "true":
-                    case "ops":
-                        yield 2;
-                    case "0":
-                    case "1":
-                    case "2":
-                    case "3":
-                    case "4":
-                    	yield Integer.parseInt(newValue);
-                    default: throw new IllegalArgumentException();
-            	};
-            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;
-
-    @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= AppStoreManager.ScarpetAppStoreValidator.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

@@ -54,7 +54,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.storage.LevelResource;
 
-import static carpet.script.CarpetEventServer.Event.CARPET_RULE_CHANGES;
 import static carpet.utils.Translations.tr;
 import static java.util.Comparator.comparing;
 import static net.minecraft.commands.Commands.argument;
@@ -263,8 +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
-        if (CARPET_RULE_CHANGES.isNeeded()) CARPET_RULE_CHANGES.onCarpetRuleChanges(rule, source);
     }
 
     /**
@@ -289,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.
@@ -326,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()
     {