From 2c708e2754dcfd912d9fec686ad0e3e1b2f6a78d Mon Sep 17 00:00:00 2001 From: D3v1s0m <49519439+D3v1s0m@users.noreply.github.com> Date: Fri, 23 Jun 2023 01:28:10 +0530 Subject: [PATCH] removed crouched property as pose can be used instead --- .../lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java | 1 - .../main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java | 2 +- .../java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java | 4 ++-- .../java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java | 4 ++-- .../java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java | 4 ++-- plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java | 1 - .../java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java | 1 - .../java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java | 1 - .../java/lol/pyr/znpcsplus/packets/V1_9PacketFactory.java | 1 - 9 files changed, 7 insertions(+), 12 deletions(-) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java index 0ebaea7..fb51022 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java @@ -44,7 +44,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { registerType("hand", ItemStack.class); registerType("offhand", ItemStack.class); - registerType("crouched", false); // TODO registerType("using_item", false); // TODO: Eating/Drinking/Blocking with sword/etc registerType("potion_color", 0xFFFFFF); // TODO registerType("potion_ambient", false); // TODO diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java index 40d0b66..d21f7aa 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java @@ -21,7 +21,7 @@ import java.util.Collection; */ public interface MetadataFactory { EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat); - Collection effects(boolean onFire, boolean crouched, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking); + Collection effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking); EntityData silent(boolean enabled); Collection name(Component name); EntityData noGravity(); diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java index abd6809..5320364 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java @@ -12,9 +12,9 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory { } @Override - public Collection effects(boolean onFire, boolean crouching, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { + public Collection effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { return list( - newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (crouching ? 0x02 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0))), + newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0))), newEntityData(7, EntityDataTypes.INT, shaking ? 140 : 0) ); } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java index de298f3..3fee8ff 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java @@ -18,8 +18,8 @@ public class V1_8MetadataFactory implements MetadataFactory { } @Override - public Collection effects(boolean onFire, boolean crouched, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { - return list(newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (crouched ? 0x02 : 0) | (invisible ? 0x20 : 0)))); + public Collection effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { + return list(newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0)))); } @Override diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java index abc401a..ff864c6 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java @@ -14,8 +14,8 @@ public class V1_9MetadataFactory extends V1_8MetadataFactory { } @Override - public Collection effects(boolean onFire, boolean crouched, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { - return list(newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (crouched ? 0x02 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0)))); + public Collection effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { + return list(newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0)))); } @Override diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java index 8f19c9a..2aefc8a 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java @@ -72,7 +72,6 @@ public class NpcTypeImpl implements NpcType { } public NpcTypeImpl build() { - allowedProperties.add(propertyRegistry.getByName("crouched")); allowedProperties.add(propertyRegistry.getByName("fire")); allowedProperties.add(propertyRegistry.getByName("invisible")); allowedProperties.add(propertyRegistry.getByName("silent")); diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java index 5ed5a79..7f21e33 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java @@ -21,7 +21,6 @@ public class V1_17PacketFactory extends V1_16PacketFactory { public Map generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) { Map data = super.generateMetadata(player, entity, properties); addAll(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), - properties.getProperty(propertyRegistry.getByName("crouched", Boolean.class)), properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)), properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)), false, diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java index 6c7abdb..c03c5c7 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java @@ -137,7 +137,6 @@ public class V1_8PacketFactory implements PacketFactory { )); addAll(data, metadataFactory.effects( properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), - properties.getProperty(propertyRegistry.getByName("crouched", Boolean.class)), false, properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)), false, diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9PacketFactory.java index 02b8d26..86bbc14 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9PacketFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9PacketFactory.java @@ -21,7 +21,6 @@ public class V1_9PacketFactory extends V1_8PacketFactory { public Map generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) { Map data = super.generateMetadata(player, entity, properties); addAll(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), - properties.getProperty(propertyRegistry.getByName("crouched", Boolean.class)), properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)), properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)), false,