From 79dc85274dce3a8a5e0b00f17307f514fd0a1487 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 4 Nov 2020 20:11:21 -0400 Subject: [PATCH] revert some app changes preparing for release of 1.17 --- src/main/java/carpet/CarpetSettings.java | 5 ++++- src/main/java/carpet/script/CarpetScriptServer.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index c3fac0d0..07d9fc18 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -71,6 +71,9 @@ public class CarpetSettings ) public static String language = "none"; + /* + These will be turned when events can be added / removed in code + @Rule( desc = "Turns on internal camera path tracing app", extra = "Controlled via 'camera' command", @@ -94,7 +97,7 @@ public class CarpetSettings appSource = "ai_tracker" ) public static boolean commandAITracker = true; - + */ @Rule(desc = "Gbhs sgnf sadsgras fhskdpri!", category = EXPERIMENTAL) diff --git a/src/main/java/carpet/script/CarpetScriptServer.java b/src/main/java/carpet/script/CarpetScriptServer.java index 923e4752..d8a7ff66 100644 --- a/src/main/java/carpet/script/CarpetScriptServer.java +++ b/src/main/java/carpet/script/CarpetScriptServer.java @@ -71,13 +71,13 @@ public class CarpetScriptServer static { - registerSettingsApp (BundledModule.carpetNative("camera", false)); - registerSettingsApp (BundledModule.carpetNative("overlay", false)); + registerBuiltInScript(BundledModule.carpetNative("camera", false)); + registerBuiltInScript(BundledModule.carpetNative("overlay", false)); registerBuiltInScript(BundledModule.carpetNative("event_test", false)); registerBuiltInScript(BundledModule.carpetNative("stats_test", false)); registerBuiltInScript(BundledModule.carpetNative("math", true)); registerBuiltInScript(BundledModule.carpetNative("chunk_display", false)); - registerSettingsApp (BundledModule.carpetNative("ai_tracker", false)); + registerBuiltInScript(BundledModule.carpetNative("ai_tracker", false)); } public CarpetScriptServer(MinecraftServer server)