From 8ad3cb73fd6808a720fa92330df8adc7d97dcf5f Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Mon, 7 Aug 2023 20:04:48 +0200 Subject: [PATCH] make the naming consistent --- .../entity/EntityPropertyRegistryImpl.java | 32 +++++++++---------- ...itsetProperty.java => BitsetProperty.java} | 6 ++-- ...leanProperty.java => BooleanProperty.java} | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) rename plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/{SimpleBitsetProperty.java => BitsetProperty.java} (82%) rename plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/{SimpleBooleanProperty.java => BooleanProperty.java} (84%) 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 54d826e..af60ea9 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java @@ -218,11 +218,11 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { register(new DummyProperty<>("skin", SkinDescriptor.class, false)); register(new GlowProperty(packetFactory)); - register(new SimpleBitsetProperty("fire", 0, 0x01)); - register(new SimpleBitsetProperty("invisible", 0, 0x20)); + register(new BitsetProperty("fire", 0, 0x01)); + register(new BitsetProperty("invisible", 0, 0x20)); register(new HoloItemProperty()); linkProperties("glow", "fire", "invisible"); - register(new SimpleBooleanProperty("silent", 4, false, legacyBooleans)); + register(new BooleanProperty("silent", 4, false, legacyBooleans)); final int skinLayersIndex; if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) skinLayersIndex = 17; @@ -231,13 +231,13 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) skinLayersIndex = 13; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) skinLayersIndex = 12; else skinLayersIndex = 10; - register(new SimpleBitsetProperty("skin_cape", skinLayersIndex, 0x01)); - register(new SimpleBitsetProperty("skin_jacket", skinLayersIndex, 0x02)); - register(new SimpleBitsetProperty("skin_left_sleeve", skinLayersIndex, 0x04)); - register(new SimpleBitsetProperty("skin_right_sleeve", skinLayersIndex, 0x08)); - register(new SimpleBitsetProperty("skin_left_leg", skinLayersIndex, 0x10)); - register(new SimpleBitsetProperty("skin_right_leg", skinLayersIndex, 0x20)); - register(new SimpleBitsetProperty("skin_hat", skinLayersIndex, 0x40)); + register(new BitsetProperty("skin_cape", skinLayersIndex, 0x01)); + register(new BitsetProperty("skin_jacket", skinLayersIndex, 0x02)); + register(new BitsetProperty("skin_left_sleeve", skinLayersIndex, 0x04)); + register(new BitsetProperty("skin_right_sleeve", skinLayersIndex, 0x08)); + register(new BitsetProperty("skin_left_leg", skinLayersIndex, 0x10)); + register(new BitsetProperty("skin_right_leg", skinLayersIndex, 0x20)); + register(new BitsetProperty("skin_hat", skinLayersIndex, 0x40)); linkProperties("skin_cape", "skin_jacket", "skin_left_sleeve", "skin_right_sleeve", "skin_left_leg", "skin_right_leg", "skin_hat"); // Armor Stand @@ -247,9 +247,9 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) armorStandIndex = 13; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) armorStandIndex = 11; else armorStandIndex = 10; - register(new SimpleBitsetProperty("small", armorStandIndex, 0x01)); - register(new SimpleBitsetProperty("arms", armorStandIndex, 0x04)); - register(new SimpleBitsetProperty("base_plate", armorStandIndex++, 0x08, true)); + register(new BitsetProperty("small", armorStandIndex, 0x01)); + register(new BitsetProperty("arms", armorStandIndex, 0x04)); + register(new BitsetProperty("base_plate", armorStandIndex++, 0x08, true)); register(new RotationProperty("head_rotation", armorStandIndex++, Vector3f.zero())); register(new RotationProperty("body_rotation", armorStandIndex++, Vector3f.zero())); register(new RotationProperty("left_arm_rotation", armorStandIndex++, new Vector3f(-10, 0, -10))); @@ -266,12 +266,12 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) ghastAttackingIndex = 12; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) ghastAttackingIndex = 11; else ghastAttackingIndex = 16; - register(new SimpleBooleanProperty("attacking", ghastAttackingIndex, false, legacyBooleans)); + register(new BooleanProperty("attacking", ghastAttackingIndex, false, legacyBooleans)); // Goat if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) { - register(new SimpleBooleanProperty("has_left_horn", 18, true, legacyBooleans)); - register(new SimpleBooleanProperty("has_right_horn", 19, true, legacyBooleans)); + register(new BooleanProperty("has_left_horn", 18, true, legacyBooleans)); + register(new BooleanProperty("has_right_horn", 19, true, legacyBooleans)); } } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/SimpleBitsetProperty.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/BitsetProperty.java similarity index 82% rename from plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/SimpleBitsetProperty.java rename to plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/BitsetProperty.java index 113f336..579074e 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/SimpleBitsetProperty.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/BitsetProperty.java @@ -8,19 +8,19 @@ import org.bukkit.entity.Player; import java.util.Map; -public class SimpleBitsetProperty extends EntityPropertyImpl { +public class BitsetProperty extends EntityPropertyImpl { private final int index; private final int bitmask; private final boolean inverted; - public SimpleBitsetProperty(String name, int index, int bitmask, boolean inverted) { + public BitsetProperty(String name, int index, int bitmask, boolean inverted) { super(name, inverted, Boolean.class); this.index = index; this.bitmask = bitmask; this.inverted = inverted; } - public SimpleBitsetProperty(String name, int index, int bitmask) { + public BitsetProperty(String name, int index, int bitmask) { this(name, index, bitmask, false); } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/SimpleBooleanProperty.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/BooleanProperty.java similarity index 84% rename from plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/SimpleBooleanProperty.java rename to plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/BooleanProperty.java index 763b0a9..d04360c 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/SimpleBooleanProperty.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/BooleanProperty.java @@ -8,11 +8,11 @@ import org.bukkit.entity.Player; import java.util.Map; -public class SimpleBooleanProperty extends EntityPropertyImpl { +public class BooleanProperty extends EntityPropertyImpl { private final int index; private final boolean legacy; - public SimpleBooleanProperty(String name, int index, boolean defaultValue, boolean legacy) { + public BooleanProperty(String name, int index, boolean defaultValue, boolean legacy) { super(name, defaultValue, Boolean.class); this.index = index; this.legacy = legacy;