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/commands/PerimeterInfoCommand.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class PerimeterInfoCommand
requires((player) -> CommandHelper.canUseCommand(player, CarpetSettings.commandPerimeterInfo)).
executes( (c) -> perimeterDiagnose(
c.getSource(),
new BlockPos(c.getSource().getPosition()),
BlockPos.containing(c.getSource().getPosition()),
null)).
then(argument("center position", BlockPosArgument.blockPos()).
executes( (c) -> perimeterDiagnose(
src/main/java/carpet/commands/PlayerCommand.java
+1 -1
View File
@@ -311,7 +311,7 @@ public class PlayerCommand
}
MinecraftServer server = source.getServer();
if (!Level.isInSpawnableBounds(new BlockPos(pos.x, pos.y, pos.z)))
if (!Level.isInSpawnableBounds(BlockPos.containing(pos.x, pos.y, pos.z)))
{
Messenger.m(context.getSource(), "rb Player "+playerName+" cannot be placed outside of the world");
return 0;
src/main/java/carpet/helpers/OptimizedExplosion.java
+2 -2
View File
@@ -342,7 +342,7 @@ public class OptimizedExplosion
double d8 = eAccess.getZ();
for (float f1 = 0.3F; f > 0.0F; f -= 0.22500001F) {
BlockPos blockpos = new BlockPos(d4, d6, d8);
BlockPos blockpos = BlockPos.containing(d4, d6, d8);
BlockState state = eAccess.getLevel().getBlockState(blockpos);
FluidState fluidState = eAccess.getLevel().getFluidState(blockpos);
@@ -534,7 +534,7 @@ public class OptimizedExplosion
boolean found = false;
for (float f1 = 0.3F; f > 0.0F; f -= 0.22500001F) {
BlockPos blockpos = new BlockPos(d4, d6, d8);
BlockPos blockpos = BlockPos.containing(d4, d6, d8);
BlockState state = eAccess.getLevel().getBlockState(blockpos);
FluidState fluidState = eAccess.getLevel().getFluidState(blockpos);
src/main/java/carpet/mixins/EntityMixin.java
+2 -1
View File
@@ -4,6 +4,7 @@ import carpet.fakes.EntityInterface;
import carpet.patches.EntityPlayerMPFake;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
@@ -21,7 +22,7 @@ public abstract class EntityMixin implements EntityInterface
@Shadow
public float yRotO;
@Shadow public @Nullable abstract Entity getControllingPassenger();
@Shadow public @Nullable abstract LivingEntity getControllingPassenger();
@Shadow public Level level;
src/main/java/carpet/mixins/LivingEntity_creativeFlyMixin.java
+2 -2
View File
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(LivingEntity.class)
public abstract class LivingEntity_creativeFlyMixin extends Entity
{
@Shadow public float flyingSpeed;
@Shadow protected abstract float getFlyingSpeed();
public LivingEntity_creativeFlyMixin(EntityType<?> type, Level world)
{
@@ -44,7 +44,7 @@ public abstract class LivingEntity_creativeFlyMixin extends Entity
{
Player self = (Player)(Object)(this);
if (self.getAbilities().flying && !onGround)
cir.setReturnValue( flyingSpeed* (float)CarpetSettings.creativeFlySpeed);
cir.setReturnValue( getFlyingSpeed() * (float)CarpetSettings.creativeFlySpeed);
}
}
}
src/main/java/carpet/patches/EntityPlayerMPFake.java
+2 -2
View File
@@ -69,7 +69,7 @@ public class EntityPlayerMPFake extends ServerPlayer
instance.teleportTo(worldIn, d0, d1, d2, (float)yaw, (float)pitch);
instance.setHealth(20.0F);
instance.unsetRemoved();
instance.maxUpStep = 0.6F;
instance.setMaxUpStep(0.6F);
instance.gameMode.changeGameModeForPlayer(gamemode);
server.getPlayerList().broadcastAll(new ClientboundRotateHeadPacket(instance, (byte) (instance.yHeadRot * 256 / 360)), dimensionId);//instance.dimension);
server.getPlayerList().broadcastAll(new ClientboundTeleportEntityPacket(instance), dimensionId);//instance.dimension);
@@ -93,7 +93,7 @@ public class EntityPlayerMPFake extends ServerPlayer
playerShadow.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
playerShadow.gameMode.changeGameModeForPlayer(player.gameMode.getGameModeForPlayer());
((ServerPlayerInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerInterface) player).getActionPack());
playerShadow.maxUpStep = 0.6F;
playerShadow.setMaxUpStep(0.6F);
playerShadow.entityData.set(DATA_PLAYER_MODE_CUSTOMISATION, player.getEntityData().get(DATA_PLAYER_MODE_CUSTOMISATION));
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());