icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-name

Browse Source
This commit is contained in:
gnembon committed 2021-04-19 23:35:13 -03:00
1 parent 6677c538fa
commit b0dafccc18
2 files changed
+4 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/api/Auxiliary.java
+2 -4
View File
@@ -23,7 +23,7 @@ import carpet.script.exception.ExitStatement;
import carpet.script.exception.InternalExpressionException; import carpet.script.exception.InternalExpressionException;
import carpet.script.exception.ThrowStatement; import carpet.script.exception.ThrowStatement;
import carpet.script.exception.Throwables; import carpet.script.exception.Throwables;
import carpet.script.utils.FixedCommandSource; import carpet.script.utils.SnoopyCommandSource;
import carpet.script.utils.InputValidator; import carpet.script.utils.InputValidator;
import carpet.script.utils.ScarpetJsonDeserializer; import carpet.script.utils.ScarpetJsonDeserializer;
import carpet.script.utils.ShapeDispatcher; import carpet.script.utils.ShapeDispatcher;
@@ -78,7 +78,6 @@ import net.minecraft.text.LiteralText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.InvalidIdentifierException; import net.minecraft.util.InvalidIdentifierException;
import net.minecraft.util.crash.CrashException;
import net.minecraft.util.Util; import net.minecraft.util.Util;
import net.minecraft.util.WorldSavePath; import net.minecraft.util.WorldSavePath;
import net.minecraft.util.dynamic.RegistryOps; 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.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;
@@ -650,7 +648,7 @@ public class Auxiliary {
Value[] error = {Value.NULL}; Value[] error = {Value.NULL};
List<Value> output = new ArrayList<>(); List<Value> output = new ArrayList<>();
Value retval = new NumericValue(s.getMinecraftServer().getCommandManager().execute( 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()) lv.get(0).evalValue(c).getString())
); );
Value ret = ListValue.of(retval, ListValue.wrap(output), error[0]); Value ret = ListValue.of(retval, ListValue.wrap(output), error[0]);
src/main/java/carpet/script/utils/FixedCommandSource.java → src/main/java/carpet/script/utils/SnoopyCommandSource.java
+2 -2
View File
@@ -21,7 +21,7 @@ import net.minecraft.world.dimension.DimensionType;
import java.util.List; import java.util.List;
import java.util.function.BinaryOperator; import java.util.function.BinaryOperator;
public class FixedCommandSource extends ServerCommandSource public class SnoopyCommandSource extends ServerCommandSource
{ {
private Vec3d position; private Vec3d position;
private ServerWorld world; private ServerWorld world;
@@ -35,7 +35,7 @@ public class FixedCommandSource extends ServerCommandSource
private final Value[] error; private final Value[] error;
private final List<Value> chatOutput; private final List<Value> chatOutput;
public FixedCommandSource(ServerCommandSource original, Vec3d pos, Value[] error, List<Value> chatOutput) public SnoopyCommandSource(ServerCommandSource original, Vec3d pos, Value[] error, List<Value> chatOutput)
{ {
super(CommandOutput.DUMMY, pos, Vec2f.ZERO, original.getWorld(), CarpetSettings.runPermissionLevel, super(CommandOutput.DUMMY, pos, Vec2f.ZERO, original.getWorld(), CarpetSettings.runPermissionLevel,
original.getName(), original.getDisplayName(), original.getMinecraftServer(), original.getEntity(), false, original.getName(), original.getDisplayName(), original.getMinecraftServer(), original.getEntity(), false,