diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java index 0288f0aa..71bccb61 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/src/main/java/carpet/script/api/Auxiliary.java @@ -23,7 +23,7 @@ import carpet.script.exception.ExitStatement; import carpet.script.exception.InternalExpressionException; import carpet.script.exception.ThrowStatement; import carpet.script.exception.Throwables; -import carpet.script.utils.FixedCommandSource; +import carpet.script.utils.SnoopyCommandSource; import carpet.script.utils.InputValidator; import carpet.script.utils.ScarpetJsonDeserializer; import carpet.script.utils.ShapeDispatcher; @@ -78,7 +78,6 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.InvalidIdentifierException; -import net.minecraft.util.crash.CrashException; import net.minecraft.util.Util; import net.minecraft.util.WorldSavePath; import net.minecraft.util.dynamic.RegistryOps; @@ -105,7 +104,6 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; import java.io.BufferedWriter; import java.io.IOException; @@ -650,7 +648,7 @@ public class Auxiliary { Value[] error = {Value.NULL}; List output = new ArrayList<>(); Value retval = new NumericValue(s.getMinecraftServer().getCommandManager().execute( - new FixedCommandSource(s, posf, error, output), + new SnoopyCommandSource(s, posf, error, output), lv.get(0).evalValue(c).getString()) ); Value ret = ListValue.of(retval, ListValue.wrap(output), error[0]); diff --git a/src/main/java/carpet/script/utils/FixedCommandSource.java b/src/main/java/carpet/script/utils/SnoopyCommandSource.java similarity index 96% rename from src/main/java/carpet/script/utils/FixedCommandSource.java rename to src/main/java/carpet/script/utils/SnoopyCommandSource.java index 2355e9b7..d81e6f13 100644 --- a/src/main/java/carpet/script/utils/FixedCommandSource.java +++ b/src/main/java/carpet/script/utils/SnoopyCommandSource.java @@ -21,7 +21,7 @@ import net.minecraft.world.dimension.DimensionType; import java.util.List; import java.util.function.BinaryOperator; -public class FixedCommandSource extends ServerCommandSource +public class SnoopyCommandSource extends ServerCommandSource { private Vec3d position; private ServerWorld world; @@ -35,7 +35,7 @@ public class FixedCommandSource extends ServerCommandSource private final Value[] error; private final List chatOutput; - public FixedCommandSource(ServerCommandSource original, Vec3d pos, Value[] error, List chatOutput) + public SnoopyCommandSource(ServerCommandSource original, Vec3d pos, Value[] error, List chatOutput) { super(CommandOutput.DUMMY, pos, Vec2f.ZERO, original.getWorld(), CarpetSettings.runPermissionLevel, original.getName(), original.getDisplayName(), original.getMinecraftServer(), original.getEntity(), false,