From 6d320866e6b2acb744f6841c29998bde7c6a0dac Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 17 Feb 2021 20:17:01 -0400 Subject: [PATCH] 21w07a --- gradle.properties | 6 +++--- .../mixins/ArmorStandEntity_scarpetMarkerMixin.java | 2 +- .../mixins/PistonBlockEntity_movableTEMixin.java | 8 ++++---- .../StructureBlockBlockEntity_limitsMixin.java | 8 +++++--- src/main/java/carpet/script/api/WorldAccess.java | 2 +- src/main/java/carpet/script/value/BlockValue.java | 2 +- src/main/java/carpet/script/value/EntityValue.java | 12 ++++++------ 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index 62202819..8ef29394 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=21w06a - yarn_mappings=21w06a+build.21 + minecraft_version=21w07a + yarn_mappings=21w07a+build.1 loader_version=0.11.1 - fabric_version=0.30.2+1.17 + fabric_version=0.30.5+1.17 # Mod Properties mod_version = 1.4.26 diff --git a/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java b/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java index 193532a6..5bb4b7c2 100644 --- a/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java +++ b/src/main/java/carpet/mixins/ArmorStandEntity_scarpetMarkerMixin.java @@ -26,7 +26,7 @@ public abstract class ArmorStandEntity_scarpetMarkerMixin extends LivingEntity * Remove all markers that do not belong to any script host and not part of the global one when loaded * @param ci */ - @Inject(method = "readCustomDataFromTag", at = @At("HEAD")) + @Inject(method = "readCustomDataFromNbt", at = @At("HEAD")) private void checkScarpetMarkerUnloaded(CallbackInfo ci) { if (!world.isClient) diff --git a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java index 093be7c3..009e134a 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java @@ -127,7 +127,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple } } - @Inject(method = "fromTag", at = @At(value = "TAIL")) + @Inject(method = "readNbt", at = @At(value = "TAIL")) private void onFromTag(CompoundTag compoundTag_1, CallbackInfo ci) { if (CarpetSettings.movableBlockEntities && compoundTag_1.contains("carriedTileEntityCM", 10)) @@ -135,18 +135,18 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple if (this.pushedBlock.getBlock() instanceof BlockEntityProvider) this.carriedBlockEntity = ((BlockEntityProvider) (this.pushedBlock.getBlock())).createBlockEntity(pos, pushedBlock);// this.world); if (carriedBlockEntity != null) //Can actually be null, as BlockPistonMoving.createNewTileEntity(...) returns null - this.carriedBlockEntity.fromTag(compoundTag_1.getCompound("carriedTileEntityCM")); + this.carriedBlockEntity.readNbt(compoundTag_1.getCompound("carriedTileEntityCM")); setCarriedBlockEntity(carriedBlockEntity); } } - @Inject(method = "toTag", at = @At(value = "RETURN", shift = At.Shift.BEFORE)) + @Inject(method = "writeNbt", at = @At(value = "RETURN", shift = At.Shift.BEFORE)) private void onToTag(CompoundTag compoundTag_1, CallbackInfoReturnable cir) { if (CarpetSettings.movableBlockEntities && this.carriedBlockEntity != null) { //Leave name "carriedTileEntityCM" instead of "carriedBlockEntityCM" for upgrade compatibility with 1.13.2 movable TE - compoundTag_1.put("carriedTileEntityCM", this.carriedBlockEntity.toTag(new CompoundTag())); + compoundTag_1.put("carriedTileEntityCM", this.carriedBlockEntity.writeNbt(new CompoundTag())); } } } diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java b/src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java index c676ae56..7060b579 100644 --- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java +++ b/src/main/java/carpet/mixins/StructureBlockBlockEntity_limitsMixin.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; public abstract class StructureBlockBlockEntity_limitsMixin { @ModifyConstant( - method = "fromTag", + method = "readNbt", constant = @Constant(intValue = 48) ) private int positiveLimit(int original) { @@ -23,7 +23,7 @@ public abstract class StructureBlockBlockEntity_limitsMixin } @ModifyConstant( - method = "fromTag", + method = "readNbt", constant = @Constant(intValue = -48) ) private int negativeLimit(int original) { @@ -41,7 +41,7 @@ public abstract class StructureBlockBlockEntity_limitsMixin private Block ignoredBlock(Block original) { return CarpetSettings.structureBlockIgnoredBlock; } - +/* @Environment(EnvType.CLIENT) @ModifyConstant( method = "getSquaredRenderDistance", @@ -50,4 +50,6 @@ public abstract class StructureBlockBlockEntity_limitsMixin private double outlineRenderDistanceLimit(double original) { return CarpetSettings.structureBlockOutlineDistance; } + + */ } diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index 0e7b019c..95ba3673 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -836,7 +836,7 @@ public class WorldAccess { destTag.putInt("x", targetPos.getX()); destTag.putInt("y", targetPos.getY()); destTag.putInt("z", targetPos.getZ()); - be.fromTag(destTag); + be.readNbt(destTag); be.markDirty(); success = true; } diff --git a/src/main/java/carpet/script/value/BlockValue.java b/src/main/java/carpet/script/value/BlockValue.java index e883f27f..c2825f26 100644 --- a/src/main/java/carpet/script/value/BlockValue.java +++ b/src/main/java/carpet/script/value/BlockValue.java @@ -121,7 +121,7 @@ public class BlockValue extends Value data = tag; return null; } - data = be.toTag(tag); + data = be.writeNbt(tag); return data; } return null; diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 6460480a..4d60505c 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -841,7 +841,7 @@ public class EntityValue extends Value }); put("nbt",(e, a) -> { - CompoundTag nbttagcompound = e.toTag((new CompoundTag())); + CompoundTag nbttagcompound = e.writeNbt((new CompoundTag())); if (a==null) return new NBTSerializableValue(nbttagcompound); return new NBTSerializableValue(nbttagcompound).get(a); @@ -884,7 +884,7 @@ public class EntityValue extends Value EnumSet set = EnumSet.noneOf(PlayerPositionLookS2CPacket.Flag.class); set.add(PlayerPositionLookS2CPacket.Flag.X_ROT); set.add(PlayerPositionLookS2CPacket.Flag.Y_ROT); - ((ServerPlayerEntity)e).networkHandler.teleportRequest(x, y, z, yaw, pitch, set ); + ((ServerPlayerEntity)e).networkHandler.requestTeleport(x, y, z, yaw, pitch, set ); } else { @@ -1458,7 +1458,7 @@ public class EntityValue extends Value Value tagValue = NBTSerializableValue.fromValue(v); if (tagValue instanceof NBTSerializableValue) { - e.fromTag(((NBTSerializableValue) tagValue).getCompoundTag()); + e.readNbt(((NBTSerializableValue) tagValue).getCompoundTag()); e.setUuid(uUID); } } @@ -1470,9 +1470,9 @@ public class EntityValue extends Value Value tagValue = NBTSerializableValue.fromValue(v); if (tagValue instanceof NBTSerializableValue) { - CompoundTag nbttagcompound = e.toTag((new CompoundTag())); + CompoundTag nbttagcompound = e.writeNbt((new CompoundTag())); nbttagcompound.copyFrom(((NBTSerializableValue) tagValue).getCompoundTag()); - e.fromTag(nbttagcompound); + e.readNbt(nbttagcompound); e.setUuid(uUID); } } @@ -1497,7 +1497,7 @@ public class EntityValue extends Value { if (!force) throw new NBTSerializableValue.IncompatibleTypeException(this); CompoundTag tag = new CompoundTag(); - tag.put("Data", getEntity().toTag( new CompoundTag())); + tag.put("Data", getEntity().writeNbt( new CompoundTag())); tag.put("Name", StringTag.of(Registry.ENTITY_TYPE.getId(getEntity().getType()).toString())); return tag; }