1.4.12

src/main/java/carpet/commands/DrawCommand.java

@@ -31,7 +31,7 @@ import java.lang.Math;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 public class DrawCommand
 {

src/main/java/carpet/commands/LogCommand.java

@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.mojang.brigadier.arguments.StringArgumentType.getString;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 public class LogCommand
 {

src/main/java/carpet/commands/MobAICommand.java

@@ -12,7 +12,7 @@ import net.minecraft.util.registry.Registry;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 public class MobAICommand
 {

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

@@ -37,7 +37,7 @@ import java.util.function.Consumer;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 public class PlayerCommand
 {

src/main/java/carpet/commands/ScriptCommand.java

@@ -48,12 +48,12 @@ import java.util.stream.Collectors;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 public class ScriptCommand
 {
-    private static TreeSet<String> scarpetFunctions;
-    private static TreeSet<String> APIFunctions;
+    private static final TreeSet<String> scarpetFunctions;
+    private static final TreeSet<String> APIFunctions;
     static
     {
         Set<String> allFunctions = (new CarpetExpression(null, "null", null, null)).getExpr().getFunctionNames();

src/main/java/carpet/commands/SpawnCommand.java

@@ -30,7 +30,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.string;
 import static com.mojang.brigadier.arguments.StringArgumentType.word;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 
 public class SpawnCommand

src/main/java/carpet/commands/TickCommand.java

@@ -20,7 +20,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString;
 import static com.mojang.brigadier.arguments.StringArgumentType.greedyString;
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 
 public class TickCommand
 {