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

1.19.4-pre1

Browse Source
This commit is contained in:
gnembon committed 2023-02-22 20:22:02 +01:00
1 parent 4d842ae382
commit 4c8e477f4b
15 files changed
+37 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetScriptHost.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class CarpetScriptHost extends ScriptHost
CarpetExpression ex = new CarpetExpression(host.main, module.code(), source, new BlockPos(0, 0, 0));
ex.getExpr().asATextSource();
host.storeSource = storeSource;
ex.scriptRunCommand(host, new BlockPos(source.getPosition()));
ex.scriptRunCommand(host, BlockPos.containing(source.getPosition()));
}
catch (CarpetExpressionException e)
{
src/main/java/carpet/script/ScriptCommand.java
+1 -1
View File
@@ -532,7 +532,7 @@ public class ScriptCommand
CarpetScriptHost host = getHost(context);
return handleCall(source, host, () -> {
CarpetExpression ex = new CarpetExpression(host.main, expr, source, new BlockPos(0, 0, 0));
return ex.scriptRunCommand(host, new BlockPos(source.getPosition()));
return ex.scriptRunCommand(host, BlockPos.containing(source.getPosition()));
});
}
src/main/java/carpet/script/api/BlockIterators.java
+15 -8
View File
@@ -50,14 +50,18 @@ public class BlockIterators
if (rangeLocator.fromBlock)
{
range = new Vec3i(
abs(rangeLocator.vec.x - center.getX()),
abs(rangeLocator.vec.y - center.getY()),
abs(rangeLocator.vec.z - center.getZ())
Mth.floor(abs(rangeLocator.vec.x - center.getX())),
Mth.floor(abs(rangeLocator.vec.y - center.getY())),
Mth.floor(abs(rangeLocator.vec.z - center.getZ()))
);
}
else
{
range = new Vec3i(abs(rangeLocator.vec.x), abs(rangeLocator.vec.y), abs(rangeLocator.vec.z));
range = new Vec3i(
Mth.floor(abs(rangeLocator.vec.x)),
Mth.floor(abs(rangeLocator.vec.y)),
Mth.floor(abs(rangeLocator.vec.z))
);
}
Vec3i upperRange = range;
if (lv.size() > rangeLocator.offset + 1) // +1 cause we still need the expression
@@ -66,14 +70,17 @@ public class BlockIterators
if (rangeLocator.fromBlock)
{
upperRange = new Vec3i(
abs(rangeLocator.vec.x - center.getX()),
abs(rangeLocator.vec.y - center.getY()),
abs(rangeLocator.vec.z - center.getZ())
Mth.floor(abs(rangeLocator.vec.x - center.getX())),
Mth.floor(abs(rangeLocator.vec.y - center.getY())),
Mth.floor(abs(rangeLocator.vec.z - center.getZ()))
);
}
else
{
upperRange = new Vec3i(abs(rangeLocator.vec.x), abs(rangeLocator.vec.y), abs(rangeLocator.vec.z));
upperRange = new Vec3i(
Mth.floor(abs(rangeLocator.vec.x)),
Mth.floor(abs(rangeLocator.vec.y)),
Mth.floor(abs(rangeLocator.vec.z)));
}
}
if (llv.size() != rangeLocator.offset + 1)
src/main/java/carpet/script/api/WorldAccess.java
+1 -1
View File
@@ -1101,7 +1101,7 @@ public class WorldAccess
String itemString = lv.get(0).getString();
Vector3Argument locator = Vector3Argument.findIn(lv, 1);
ItemInput stackArg = NBTSerializableValue.parseItem(itemString, cc.registryAccess());
BlockPos where = new BlockPos(locator.vec);
BlockPos where = BlockPos.containing(locator.vec);
// Paintings throw an exception if their direction is vertical, therefore we change the default here
String facing = lv.size() > locator.offset
? lv.get(locator.offset).getString()
src/main/java/carpet/script/utils/EntityTools.java
+1 -1
View File
@@ -17,7 +17,7 @@ public class EntityTools
return;
}
float m = e.level.getBlockState(e.blockPosition()).getBlock().getJumpFactor();
float g = e.level.getBlockState(new BlockPos(e.getX(), e.getBoundingBox().minY - 0.5000001D, e.getZ())).getBlock().getJumpFactor();
float g = e.level.getBlockState(BlockPos.containing(e.getX(), e.getBoundingBox().minY - 0.5000001D, e.getZ())).getBlock().getJumpFactor();
float jumpVelocityMultiplier = m == 1.0D ? g : m;
float jumpStrength = (0.42F * jumpVelocityMultiplier);
Vec3 vec3d = e.getDeltaMovement();
src/main/java/carpet/script/utils/ShapesRenderer.java
+1 -1
View File
@@ -381,7 +381,7 @@ public class ShapesRenderer
RenderSystem.enableCull();
RenderSystem.enableDepthTest();
blockPos = new BlockPos(v1);
blockPos = BlockPos.containing(v1);
int light = 0;
if (client.level != null)
{
src/main/java/carpet/script/value/EntityValue.java
+2 -2
View File
@@ -1331,7 +1331,7 @@ public class EntityValue extends Value
{
List<Value> list = lv.getItems();
Vector3Argument locator = Vector3Argument.findIn(list, 0, false, false);
pos = new BlockPos(locator.vec.x, locator.vec.y, locator.vec.z);
pos = BlockPos.containing(locator.vec.x, locator.vec.y, locator.vec.z);
if (list.size() > locator.offset)
{
distance = (int) NumericValue.asNumber(list.get(locator.offset)).getLong();
@@ -1365,7 +1365,7 @@ public class EntityValue extends Value
{
List<Value> params = lv.getItems();
Vector3Argument blockLocator = Vector3Argument.findIn(params, 0, false, false);
BlockPos pos = new BlockPos(blockLocator.vec);
BlockPos pos = BlockPos.containing(blockLocator.vec);
ResourceKey<Level> world = spe.getCommandSenderWorld().dimension();
float angle = spe.getYHeadRot();
boolean forced = false;
src/main/java/carpet/script/value/NBTSerializableValue.java
+2 -2
View File
@@ -315,7 +315,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
if (v1 instanceof final ListValue lv)
{
List<Value> args = lv.getItems();
BlockPos pos = new BlockPos(
BlockPos pos = BlockPos.containing(
NumericValue.asNumber(args.get(0)).getDouble(),
NumericValue.asNumber(args.get(1)).getDouble(),
NumericValue.asNumber(args.get(2)).getDouble());
@@ -326,7 +326,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
{
return !screenValue.isOpen() ? null : new InventoryLocator(screenValue.getPlayer(), screenValue.getPlayer().blockPosition(), screenValue.getInventory(), offset + 1);
}
BlockPos pos = new BlockPos(
BlockPos pos = BlockPos.containing(
NumericValue.asNumber(v1).getDouble(),
NumericValue.asNumber(params.get(1 + offset)).getDouble(),
NumericValue.asNumber(params.get(2 + offset)).getDouble());