From 86e021f2776429467777f4dc97b752421c149c8c Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Sat, 26 Aug 2023 22:23:24 +0200 Subject: [PATCH] delete metadata classes --- .../znpcsplus/metadata/MetadataFactory.java | 56 --------- .../metadata/V1_10MetadataFactory.java | 29 ----- .../metadata/V1_11MetadataFactory.java | 17 --- .../metadata/V1_12MetadataFactory.java | 33 ------ .../metadata/V1_13MetadataFactory.java | 13 --- .../metadata/V1_14MetadataFactory.java | 57 ---------- .../metadata/V1_15MetadataFactory.java | 45 -------- .../metadata/V1_16MetadataFactory.java | 6 - .../metadata/V1_17MetadataFactory.java | 76 ------------- .../metadata/V1_19MetadataFactory.java | 12 -- .../metadata/V1_8MetadataFactory.java | 106 ------------------ .../metadata/V1_9MetadataFactory.java | 29 ----- 12 files changed, 479 deletions(-) delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_11MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_12MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_19MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java deleted file mode 100644 index e73973f..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java +++ /dev/null @@ -1,56 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose; -import lol.pyr.znpcsplus.util.CreeperState; -import lol.pyr.znpcsplus.util.ParrotVariant; - -/** - * 1.8 ... - * 1.9 ... - * 1.10 ... - * 1.11 ... - * 1.12 ... - * 1.13 ... - * 1.14 ... - * 1.15 ... - * 1.16 ... - * 1.17 ... - * 1.18-1.19 ... - * 1.20 ... - */ -@Deprecated -public interface MetadataFactory { - - EntityData pose(EntityPose pose); - - EntityData usingItem(boolean enabled, boolean offhand, boolean riptide); - - EntityData shoulderEntityLeft(ParrotVariant variant); - EntityData shoulderEntityRight(ParrotVariant variant); - - // Axolotl - EntityData axolotlVariant(int variant); - EntityData playingDead(boolean playingDead); - - // Blaze - EntityData blazeOnFire(boolean onFire); - - // Creeper - EntityData creeperState(CreeperState state); - EntityData creeperCharged(boolean charged); - - // Enderman - EntityData endermanHeldBlock(int heldBlock); - EntityData endermanScreaming(boolean screaming); - EntityData endermanStaring(boolean staring); - - // Evoker - EntityData evokerSpell(int spell); - - // Frog - EntityData frogVariant(int variant); - - // Villager - EntityData villagerData(int type, int profession, int level); -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java deleted file mode 100644 index d6669c4..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import lol.pyr.znpcsplus.util.CreeperState; - -@Deprecated -public class V1_10MetadataFactory extends V1_9MetadataFactory { - - @Override - public EntityData blazeOnFire(boolean onFire) { - return newEntityData(12, EntityDataTypes.BYTE, (byte) (onFire ? 0x01 : 0)); - } - - @Override - public EntityData creeperState(CreeperState state) { - return newEntityData(12, EntityDataTypes.INT, state.getState()); - } - - @Override - public EntityData creeperCharged(boolean charged) { - return newEntityData(13, EntityDataTypes.BOOLEAN, charged); - } - - @Override - public EntityData villagerData(int type, int profession, int level) { - return newEntityData(13, EntityDataTypes.INT, profession); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_11MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_11MetadataFactory.java deleted file mode 100644 index fb68a00..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_11MetadataFactory.java +++ /dev/null @@ -1,17 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; - -@Deprecated -public class V1_11MetadataFactory extends V1_10MetadataFactory { - @Override - public EntityData usingItem(boolean usingItem, boolean offHand, boolean riptide) { - return newEntityData(6, EntityDataTypes.BYTE, (byte) ((usingItem ? 0x01 : 0) | (offHand ? 0x02 : 0))); - } - - @Override - public EntityData evokerSpell(int spell) { - return newEntityData(12, EntityDataTypes.BYTE, (byte) spell); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_12MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_12MetadataFactory.java deleted file mode 100644 index 66660b4..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_12MetadataFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import com.github.retrooper.packetevents.protocol.nbt.NBTCompound; -import lol.pyr.znpcsplus.entity.ParrotNBTCompound; -import lol.pyr.znpcsplus.util.ParrotVariant; - -@Deprecated -public class V1_12MetadataFactory extends V1_11MetadataFactory { - @Override - public EntityData shoulderEntityLeft(ParrotVariant variant) { - return createShoulderEntityLeft(15, variant); - } - - public EntityData createShoulderEntityLeft(int index, ParrotVariant variant) { - return newEntityData(index, EntityDataTypes.NBT, variant == ParrotVariant.NONE ? new NBTCompound() : new ParrotNBTCompound(variant).getTag()); - } - - @Override - public EntityData shoulderEntityRight(ParrotVariant variant) { - return createShoulderEntityRight(16, variant); - } - - public EntityData createShoulderEntityRight(int index, ParrotVariant variant) { - return newEntityData(index, EntityDataTypes.NBT, variant == ParrotVariant.NONE ? new NBTCompound() : new ParrotNBTCompound(variant).getTag()); - } - - @Override - public EntityData evokerSpell(int spell) { - return newEntityData(13, EntityDataTypes.BYTE, (byte) spell); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java deleted file mode 100644 index 6f127a6..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_13MetadataFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; - -@Deprecated -public class V1_13MetadataFactory extends V1_12MetadataFactory { - - @Override - public EntityData usingItem(boolean usingItem, boolean offHand, boolean riptide) { - return newEntityData(6, EntityDataTypes.BYTE, (byte) ((usingItem ? 0x01 : 0) | (offHand ? 0x02 : 0) | (riptide ? 0x04 : 0))); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java deleted file mode 100644 index eebf156..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java +++ /dev/null @@ -1,57 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose; -import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData; -import lol.pyr.znpcsplus.util.CreeperState; -import lol.pyr.znpcsplus.util.ParrotVariant; - -@Deprecated -public class V1_14MetadataFactory extends V1_13MetadataFactory { - - @Override - public EntityData pose(EntityPose pose) { - return newEntityData(6, EntityDataTypes.ENTITY_POSE, pose); - } - - @Override - public EntityData usingItem(boolean usingItem, boolean offHand, boolean riptide) { - return newEntityData(7, EntityDataTypes.BYTE, (byte) ((usingItem ? 0x01 : 0) | (offHand ? 0x02 : 0) | (riptide ? 0x04 : 0))); - } - - @Override - public EntityData shoulderEntityLeft(ParrotVariant variant) { - return createShoulderEntityLeft(17, variant); - } - - @Override - public EntityData shoulderEntityRight(ParrotVariant variant) { - return createShoulderEntityRight(18, variant); - } - - @Override - public EntityData blazeOnFire(boolean onFire) { - return newEntityData(14, EntityDataTypes.BYTE, (byte) (onFire ? 0x01 : 0)); - } - - @Override - public EntityData creeperState(CreeperState state) { - return newEntityData(14, EntityDataTypes.INT, state.getState()); - } - - @Override - public EntityData creeperCharged(boolean charged) { - return newEntityData(15, EntityDataTypes.BOOLEAN, charged); - } - - @Override - public EntityData evokerSpell(int spell) { - return newEntityData(15, EntityDataTypes.BYTE, (byte) spell); - } - - @Override - public EntityData villagerData(int type, int profession, int level) { - return newEntityData(16, EntityDataTypes.VILLAGER_DATA, new VillagerData(type, profession, level)); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java deleted file mode 100644 index 5a3f1b3..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java +++ /dev/null @@ -1,45 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData; -import lol.pyr.znpcsplus.util.CreeperState; -import lol.pyr.znpcsplus.util.ParrotVariant; - -@Deprecated -public class V1_15MetadataFactory extends V1_14MetadataFactory { - @Override - public EntityData shoulderEntityLeft(ParrotVariant variant) { - return createShoulderEntityLeft(18, variant); - } - - @Override - public EntityData shoulderEntityRight(ParrotVariant variant) { - return createShoulderEntityRight(19, variant); - } - - @Override - public EntityData blazeOnFire(boolean onFire) { - return newEntityData(15, EntityDataTypes.BYTE, (byte) (onFire ? 0x01 : 0)); - } - - @Override - public EntityData creeperState(CreeperState state) { - return newEntityData(15, EntityDataTypes.INT, state.getState()); - } - - @Override - public EntityData creeperCharged(boolean charged) { - return newEntityData(16, EntityDataTypes.BOOLEAN, charged); - } - - @Override - public EntityData evokerSpell(int spell) { - return newEntityData(16, EntityDataTypes.BYTE, (byte) spell); - } - - @Override - public EntityData villagerData(int type, int profession, int level) { - return newEntityData(17, EntityDataTypes.VILLAGER_DATA, new VillagerData(type, profession, level)); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java deleted file mode 100644 index d1c3c6f..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java +++ /dev/null @@ -1,6 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -@Deprecated -public class V1_16MetadataFactory extends V1_15MetadataFactory { - -} 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 deleted file mode 100644 index 38a3a7f..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java +++ /dev/null @@ -1,76 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData; -import lol.pyr.znpcsplus.util.CreeperState; -import lol.pyr.znpcsplus.util.ParrotVariant; - -@Deprecated -public class V1_17MetadataFactory extends V1_16MetadataFactory { - - @Override - public EntityData usingItem(boolean usingItem, boolean offHand, boolean riptide) { - return newEntityData(8, EntityDataTypes.BYTE, (byte) ((usingItem ? 0x01 : 0) | (offHand ? 0x02 : 0) | (riptide ? 0x04 : 0))); - } - - @Override - public EntityData shoulderEntityLeft(ParrotVariant variant) { - return createShoulderEntityLeft(19, variant); - } - - @Override - public EntityData shoulderEntityRight(ParrotVariant variant) { - return createShoulderEntityRight(20, variant); - } - - @Override - public EntityData axolotlVariant(int variant) { - return newEntityData(17, EntityDataTypes.INT, variant); - } - - @Override - public EntityData playingDead(boolean playingDead) { - return newEntityData(18, EntityDataTypes.BOOLEAN, playingDead); - } - - @Override - public EntityData blazeOnFire(boolean onFire) { - return newEntityData(16, EntityDataTypes.BYTE, (byte) (onFire ? 0x01 : 0)); - } - - @Override - public EntityData creeperState(CreeperState state) { - return newEntityData(16, EntityDataTypes.INT, state.getState()); - } - - @Override - public EntityData creeperCharged(boolean charged) { - return newEntityData(17, EntityDataTypes.BOOLEAN, charged); - } - - @Override - public EntityData endermanHeldBlock(int carriedBlock) { - return newEntityData(16, EntityDataTypes.INT, carriedBlock); - } - - @Override - public EntityData endermanScreaming(boolean screaming) { - return newEntityData(17, EntityDataTypes.BOOLEAN, screaming); - } - - @Override - public EntityData endermanStaring(boolean staring) { - return newEntityData(18, EntityDataTypes.BOOLEAN, staring); - } - - @Override - public EntityData evokerSpell(int spell) { - return newEntityData(17, EntityDataTypes.BYTE, (byte) spell); - } - - @Override - public EntityData villagerData(int type, int profession, int level) { - return newEntityData(18, EntityDataTypes.VILLAGER_DATA, new VillagerData(type, profession, level)); - } -} diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_19MetadataFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_19MetadataFactory.java deleted file mode 100644 index c39fb4a..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_19MetadataFactory.java +++ /dev/null @@ -1,12 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; - -@Deprecated -public class V1_19MetadataFactory extends V1_17MetadataFactory { - @Override - public EntityData frogVariant(int variant) { - return newEntityData(17, EntityDataTypes.FROG_VARIANT, variant); - } -} 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 deleted file mode 100644 index 4cb3cf7..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java +++ /dev/null @@ -1,106 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataType; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose; -import lol.pyr.znpcsplus.util.*; - -@Deprecated -public class V1_8MetadataFactory implements MetadataFactory { - - @Override - public EntityData pose(EntityPose pose) { - throw new UnsupportedOperationException("The pose entity data isn't supported on this version"); - } - - @Override - public EntityData usingItem(boolean enabled, boolean offHand, boolean riptide) { - throw new UnsupportedOperationException("The standalone using item data isn't supported on this version"); - } - - @Override - public EntityData shoulderEntityLeft(ParrotVariant variant) { - throw new UnsupportedOperationException("The shoulder entity data isn't supported on this version"); - } - - @Override - public EntityData shoulderEntityRight(ParrotVariant variant) { - throw new UnsupportedOperationException("The shoulder entity data isn't supported on this version"); - } - - @Override - public EntityData axolotlVariant(int variant) { - throw new UnsupportedOperationException("The axolotl variant entity data isn't supported on this version"); - } - - @Override - public EntityData playingDead(boolean playingDead) { - throw new UnsupportedOperationException("The playing dead entity data isn't supported on this version"); - } - - @Override - public EntityData blazeOnFire(boolean onFire) { - return newEntityData(16, EntityDataTypes.BYTE, (byte) (onFire ? 1 : 0)); - } - - @Override - public EntityData creeperState(CreeperState state) { - return newEntityData(16, EntityDataTypes.BYTE, (byte) state.getState()); - } - - @Override - public EntityData creeperCharged(boolean charged) { - return newEntityData(17, EntityDataTypes.BYTE, (byte) (charged ? 1 : 0)); - } - - @Override - public EntityData endermanHeldBlock(int carriedBlock) { - throw new UnsupportedOperationException("The enderman carried block entity data isn't supported on this version"); - } - - @Override - public EntityData endermanScreaming(boolean screaming) { - throw new UnsupportedOperationException("The enderman screaming entity data isn't supported on this version"); - } - - @Override - public EntityData endermanStaring(boolean staring) { - return newEntityData(18, EntityDataTypes.BOOLEAN, staring); - } - - @Override - public EntityData evokerSpell(int spell) { - throw new UnsupportedOperationException("The evoker spell entity data isn't supported on this version"); - } - - @Override - public EntityData frogVariant(int variant) { - throw new UnsupportedOperationException("The frog variant entity data isn't supported on this version"); - } - - @Override - public EntityData villagerData(int type, int profession, int level) { - return newEntityData(16, EntityDataTypes.INT, profession); - } - - protected EntityData createSkinLayers(int index, boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) { - return newEntityData(index, EntityDataTypes.BYTE, (byte) ( - (cape ? 0x01 : 0) | - (jacket ? 0x02 : 0) | - (leftSleeve ? 0x04 : 0) | - (rightSleeve ? 0x08 : 0) | - (leftLeg ? 0x10 : 0) | - (rightLeg ? 0x20 : 0) | - (hat ? 0x40 : 0)) - ); - } - - protected EntityData newEntityData(int index, EntityDataType type, T value) { - return new EntityData(index, type, value); - } - - protected EntityData createRotations(int index, Vector3f rotations) { - return newEntityData(index, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rotations.getX(), rotations.getY(), rotations.getZ())); - } -} 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 deleted file mode 100644 index 1a4ce69..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -package lol.pyr.znpcsplus.metadata; - -import com.github.retrooper.packetevents.protocol.entity.data.EntityData; -import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; -import lol.pyr.znpcsplus.util.CreeperState; - -@Deprecated -public class V1_9MetadataFactory extends V1_8MetadataFactory { - - @Override - public EntityData blazeOnFire(boolean onFire) { - return newEntityData(16, EntityDataTypes.BYTE, (byte) (onFire ? 1 : 0)); - } - - @Override - public EntityData creeperState(CreeperState state) { - return newEntityData(11, EntityDataTypes.INT, state.getState()); - } - - @Override - public EntityData creeperCharged(boolean charged) { - return newEntityData(12, EntityDataTypes.BOOLEAN, charged); - } - - @Override - public EntityData villagerData(int type, int profession, int level) { - return newEntityData(12, EntityDataTypes.INT, profession); - } -}