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

Migrate the Carpet codebase to Mojang Mappings

Browse Source
This commit is contained in:
altrisi committed 2022-01-24 20:33:16 +01:00
1 parent a1a2488bc3
commit 06af9ce8b1
346 files changed
+8353 -8492
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/argument/BlockArgument.java
+5 -6
View File
@@ -8,11 +8,10 @@ import carpet.script.value.NullValue;
import carpet.script.value.NumericValue;
import carpet.script.value.StringValue;
import carpet.script.value.Value;
import net.minecraft.util.math.BlockPos;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import net.minecraft.core.BlockPos;
public class BlockArgument extends Argument
{
@@ -77,7 +76,7 @@ public class BlockArgument extends Argument
return new BlockArgument(
new BlockValue(
null,
c.s.getWorld(),
c.s.getLevel(),
new BlockPos(c.origin.getX() + xpos, c.origin.getY() + ypos, c.origin.getZ() + zpos)
),
1 + offset);
@@ -88,7 +87,7 @@ public class BlockArgument extends Argument
return new BlockArgument(
new BlockValue(
null,
c.s.getWorld(),
c.s.getLevel(),
new BlockPos(c.origin.getX() + xpos, c.origin.getY() + ypos, c.origin.getZ() + zpos)
),
3 + offset
@@ -127,7 +126,7 @@ public class BlockArgument extends Argument
return new BlockArgument(
new BlockValue(
null,
c.s.getWorld(),
c.s.getLevel(),
new BlockPos(c.origin.getX() + xpos, c.origin.getY() + ypos, c.origin.getZ() + zpos)
),
1+offset);
@@ -138,7 +137,7 @@ public class BlockArgument extends Argument
return new BlockArgument(
new BlockValue(
null,
c.s.getWorld(),
c.s.getLevel(),
new BlockPos(c.origin.getX() + xpos, c.origin.getY() + ypos, c.origin.getZ() + zpos)
),
3+offset
src/main/java/carpet/script/argument/FileArgument.java
+17 -17
View File
@@ -13,13 +13,13 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.ReportedException;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtAccounter;
import net.minecraft.nbt.NbtIo;
import net.minecraft.nbt.NbtTagSizeTracker;
import net.minecraft.nbt.NbtElement;
import net.minecraft.nbt.NbtTypes;
import net.minecraft.util.WorldSavePath;
import net.minecraft.util.crash.CrashException;
import net.minecraft.nbt.Tag;
import net.minecraft.nbt.TagTypes;
import net.minecraft.world.level.storage.LevelResource;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -172,7 +172,7 @@ public class FileArgument
{
if (CarpetServer.minecraft_server == null)
throw new InternalExpressionException("Accessing world files without server running");
return CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+suffix);
return CarpetServer.minecraft_server.getWorldPath(LevelResource.ROOT).resolve("scripts/"+suffix);
}
private Path toPath(Module module)
@@ -330,7 +330,7 @@ public class FileArgument
return true;
}
public NbtElement getNbtData(Module module) // aka getData
public Tag getNbtData(Module module) // aka getData
{
try { synchronized (writeIOSync) {
Path dataFile = toPath(module);
@@ -344,7 +344,7 @@ public class FileArgument
//copied private method from net.minecraft.nbt.NbtIo.read()
// to read non-compound tags - these won't be compressed
public static NbtElement readTag(Path path)
public static Tag readTag(Path path)
{
try
{
@@ -374,7 +374,7 @@ public class FileArgument
else
{
dataInput_1.readUTF();
return NbtTypes.byId(byte_1).read(dataInput_1, 0, NbtTagSizeTracker.EMPTY);
return TagTypes.getType(byte_1).load(dataInput_1, 0, NbtAccounter.UNLIMITED);
}
}
catch (IOException secondIO)
@@ -386,13 +386,13 @@ public class FileArgument
}
}
}
catch (CrashException e)
catch (ReportedException e)
{
throw new ThrowStatement("Error when reading NBT file "+path.toString(), Throwables.NBT_ERROR);
}
}
public boolean saveNbtData(Module module, NbtElement tag) // aka saveData
public boolean saveNbtData(Module module, Tag tag) // aka saveData
{
try { synchronized (writeIOSync) {
Path dataFile = toPath(module);
@@ -407,7 +407,7 @@ public class FileArgument
}
//copied private method from net.minecraft.nbt.NbtIo.write() and client method safe_write
public static boolean writeTagDisk(NbtElement tag_1, Path path, boolean zipped)
public static boolean writeTagDisk(Tag tag_1, Path path, boolean zipped)
{
Path original = path;
try
@@ -418,16 +418,16 @@ public class FileArgument
Files.deleteIfExists(path);
}
if (tag_1 instanceof NbtCompound)
if (tag_1 instanceof CompoundTag)
{
NbtIo.writeCompressed((NbtCompound) tag_1, Files.newOutputStream(path));
NbtIo.writeCompressed((CompoundTag) tag_1, Files.newOutputStream(path));
}
else
{
try (DataOutputStream dataOutputStream_1 = new DataOutputStream(Files.newOutputStream(path)))
{
dataOutputStream_1.writeByte(tag_1.getType());
if (tag_1.getType() != 0)
dataOutputStream_1.writeByte(tag_1.getId());
if (tag_1.getId() != 0)
{
dataOutputStream_1.writeUTF("");
tag_1.write(dataOutputStream_1);
src/main/java/carpet/script/argument/Vector3Argument.java
+9 -10
View File
@@ -6,28 +6,27 @@ import carpet.script.value.EntityValue;
import carpet.script.value.ListValue;
import carpet.script.value.NumericValue;
import carpet.script.value.Value;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.Vec3d;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.phys.Vec3;
public class Vector3Argument extends Argument
{
public Vec3d vec;
public Vec3 vec;
public final double yaw;
public final double pitch;
public boolean fromBlock = false;
public Entity entity = null;
private Vector3Argument(Vec3d v, int o)
private Vector3Argument(Vec3 v, int o)
{
super(o);
this.vec = v;
this.yaw = 0.0D;
this.pitch = 0.0D;
}
private Vector3Argument(Vec3d v, int o, double y, double p)
private Vector3Argument(Vec3 v, int o, double y, double p)
{
super(o);
this.vec = v;
@@ -63,17 +62,17 @@ public class Vector3Argument extends Argument
Value v1 = params.next();
if (v1 instanceof BlockValue)
{
return (new Vector3Argument(Vec3d.ofCenter(((BlockValue) v1).getPos()), 1+offset)).fromBlock();
return (new Vector3Argument(Vec3.atCenterOf(((BlockValue) v1).getPos()), 1+offset)).fromBlock();
}
if (optionalEntity && v1 instanceof EntityValue)
{
Entity e = ((EntityValue) v1).getEntity();
return new Vector3Argument(e.getPos(), 1+offset).withEntity(e);
return new Vector3Argument(e.position(), 1+offset).withEntity(e);
}
if (v1 instanceof ListValue)
{
List<Value> args = ((ListValue) v1).getItems();
Vec3d pos = new Vec3d(
Vec3 pos = new Vec3(
NumericValue.asNumber(args.get(0)).getDouble(),
NumericValue.asNumber(args.get(1)).getDouble(),
NumericValue.asNumber(args.get(2)).getDouble());
@@ -86,7 +85,7 @@ public class Vector3Argument extends Argument
}
return new Vector3Argument(pos,offset+1, yaw, pitch);
}
Vec3d pos = new Vec3d(
Vec3 pos = new Vec3(
NumericValue.asNumber(v1).getDouble(),
NumericValue.asNumber(params.next()).getDouble(),
NumericValue.asNumber(params.next()).getDouble());