Use constants for a few magic numbers in rules

This commit is contained in:
altrisi committed 2022-12-26 16:22:09 +01:00
1 parent 43bb84437f
commit 4496241524
9 files changed
+19 -17

No files matched your search

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(CloneCommands.class)
public abstract class CloneCommands_fillUpdatesMixin
{
@ModifyConstant(method = "clone", constant = @Constant(intValue = 32768))
@ModifyConstant(method = "clone", constant = @Constant(intValue = CarpetSettings.VANILLA_FILL_LIMIT))
private static int fillLimit(int original) {
return CarpetSettings.fillLimit;
}
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Mixin(FillBiomeCommand.class)
public class FillBiomeCommandMixin
{
@ModifyConstant(method = "fill", constant = @Constant(intValue = 32768))
@ModifyConstant(method = "fill", constant = @Constant(intValue = CarpetSettings.VANILLA_FILL_LIMIT))
private static int fillLimit(int original)
{
return CarpetSettings.fillLimit;
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(FillCommand.class)
public abstract class FillCommandMixin
{
@ModifyConstant(method = "fillBlocks", constant = @Constant(intValue = 32768))
@ModifyConstant(method = "fillBlocks", constant = @Constant(intValue = CarpetSettings.VANILLA_FILL_LIMIT))
private static int fillLimit(int original)
{
return CarpetSettings.fillLimit;
@@ -7,9 +7,9 @@ import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Mixin(value = PistonStructureResolver.class, priority = 420) // piston push limit is important for carpet
public class PistonHandler_pushLimitMixin
public class PistonStructureResolver_pushLimitMixin
{
@ModifyConstant(method = "addBlockLine", constant = @Constant(intValue = 12), expect = 3)
@ModifyConstant(method = "addBlockLine", constant = @Constant(intValue = PistonStructureResolver.MAX_PUSH_DEPTH), expect = 3)
private int pushLimit(int original)
{
return CarpetSettings.pushLimit;
@@ -6,6 +6,8 @@ import net.minecraft.core.Vec3i;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket;
import net.minecraft.util.Mth;
import net.minecraft.world.level.block.entity.StructureBlockEntity;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
@@ -39,7 +41,7 @@ public class ServerboundSetStructureBlockPacketMixin {
)
private void structureBlockLimitsWrite(FriendlyByteBuf buf, CallbackInfo ci) {
//client method, only applicable if with carpet is on the server, or running locally
if (CarpetSettings.structureBlockLimit != CarpetSettings.vanillaStructureBlockLimit)
if (CarpetSettings.structureBlockLimit != StructureBlockEntity.MAX_SIZE_PER_AXIS)
{
buf.writeInt(this.offset.getX());
buf.writeInt(this.offset.getY());
@@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.block.entity.StructureBlockEntity;
@@ -14,7 +14,7 @@ public abstract class StructureBlockEntity_limitsMixin
{
@ModifyConstant(
method = "load",
constant = @Constant(intValue = 48)
constant = @Constant(intValue = StructureBlockEntity.MAX_SIZE_PER_AXIS)
)
private int positiveLimit(int original) {
return CarpetSettings.structureBlockLimit;
@@ -22,7 +22,7 @@ public abstract class StructureBlockEntity_limitsMixin
@ModifyConstant(
method = "load",
constant = @Constant(intValue = -48)
constant = @Constant(intValue = -StructureBlockEntity.MAX_SIZE_PER_AXIS)
)
private int negativeLimit(int original) {
return -CarpetSettings.structureBlockLimit;