From 886b5c1f927d17a452e93e5318a806662661e0c5 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Tue, 27 Jun 2023 14:36:43 +0200 Subject: [PATCH] make rotation data creations a bit shorter --- .../znpcsplus/metadata/V1_10MetadataFactory.java | 12 ++++++------ .../znpcsplus/metadata/V1_14MetadataFactory.java | 12 ++++++------ .../znpcsplus/metadata/V1_15MetadataFactory.java | 12 ++++++------ .../znpcsplus/metadata/V1_17MetadataFactory.java | 14 ++++++-------- .../znpcsplus/metadata/V1_8MetadataFactory.java | 16 ++++++++++------ .../znpcsplus/metadata/V1_9MetadataFactory.java | 8 +++++++- 6 files changed, 41 insertions(+), 33 deletions(-) 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 index a0973cd..71967a7 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java @@ -32,31 +32,31 @@ public class V1_10MetadataFactory extends V1_9MetadataFactory { @Override public EntityData armorStandHeadRotation(Vector3f headRotation) { - return newEntityData(12, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(headRotation.getX(), headRotation.getY(), headRotation.getZ())); + return createRotations(12, headRotation); } @Override public EntityData armorStandBodyRotation(Vector3f bodyRotation) { - return newEntityData(13, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(bodyRotation.getX(), bodyRotation.getY(), bodyRotation.getZ())); + return createRotations(13, bodyRotation); } @Override public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) { - return newEntityData(14, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftArmRotation.getX(), leftArmRotation.getY(), leftArmRotation.getZ())); + return createRotations(14, leftArmRotation); } @Override public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) { - return newEntityData(15, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightArmRotation.getX(), rightArmRotation.getY(), rightArmRotation.getZ())); + return createRotations(15, rightArmRotation); } @Override public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) { - return newEntityData(16, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftLegRotation.getX(), leftLegRotation.getY(), leftLegRotation.getZ())); + return createRotations(16, leftLegRotation); } @Override public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) { - return newEntityData(17, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightLegRotation.getX(), rightLegRotation.getY(), rightLegRotation.getZ())); + return createRotations(17, rightLegRotation); } } 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 index d9face6..3aac0ff 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java @@ -38,31 +38,31 @@ public class V1_14MetadataFactory extends V1_13MetadataFactory { @Override public EntityData armorStandHeadRotation(Vector3f headRotation) { - return newEntityData(14, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(headRotation.getX(), headRotation.getY(), headRotation.getZ())); + return createRotations(14, headRotation); } @Override public EntityData armorStandBodyRotation(Vector3f bodyRotation) { - return newEntityData(15, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(bodyRotation.getX(), bodyRotation.getY(), bodyRotation.getZ())); + return createRotations(15, bodyRotation); } @Override public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) { - return newEntityData(16, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftArmRotation.getX(), leftArmRotation.getY(), leftArmRotation.getZ())); + return createRotations(16, leftArmRotation); } @Override public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) { - return newEntityData(17, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightArmRotation.getX(), rightArmRotation.getY(), rightArmRotation.getZ())); + return createRotations(17, rightArmRotation); } @Override public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) { - return newEntityData(18, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftLegRotation.getX(), leftLegRotation.getY(), leftLegRotation.getZ())); + return createRotations(18, leftLegRotation); } @Override public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) { - return newEntityData(19, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightLegRotation.getX(), rightLegRotation.getY(), rightLegRotation.getZ())); + return createRotations(19, rightLegRotation); } } 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 index 815109d..409c7cd 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java @@ -12,31 +12,31 @@ public class V1_15MetadataFactory extends V1_14MetadataFactory { @Override public EntityData armorStandHeadRotation(Vector3f headRotation) { - return newEntityData(15, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(headRotation.getX(), headRotation.getY(), headRotation.getZ())); + return createRotations(15, headRotation); } @Override public EntityData armorStandBodyRotation(Vector3f bodyRotation) { - return newEntityData(16, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(bodyRotation.getX(), bodyRotation.getY(), bodyRotation.getZ())); + return createRotations(16, bodyRotation); } @Override public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) { - return newEntityData(17, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftArmRotation.getX(), leftArmRotation.getY(), leftArmRotation.getZ())); + return createRotations(17, leftArmRotation); } @Override public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) { - return newEntityData(18, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightArmRotation.getX(), rightArmRotation.getY(), rightArmRotation.getZ())); + return createRotations(18, rightArmRotation); } @Override public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) { - return newEntityData(19, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftLegRotation.getX(), leftLegRotation.getY(), leftLegRotation.getZ())); + return createRotations(19, leftLegRotation); } @Override public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) { - return newEntityData(20, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightLegRotation.getX(), rightLegRotation.getY(), rightLegRotation.getZ())); + return createRotations(20, rightLegRotation); } } 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 ab550ef..07d07bd 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 @@ -42,33 +42,31 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory { @Override public EntityData armorStandHeadRotation(Vector3f headRotation) { - return newEntityData(16, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(headRotation.getX(), headRotation.getY(), headRotation.getZ())); + return createRotations(16, headRotation); } @Override public EntityData armorStandBodyRotation(Vector3f bodyRotation) { - return newEntityData(17, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(bodyRotation.getX(), bodyRotation.getY(), bodyRotation.getZ())); + return createRotations(17, bodyRotation); } @Override public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) { - return newEntityData(18, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftArmRotation.getX(), leftArmRotation.getY(), leftArmRotation.getZ())); + return createRotations(18, leftArmRotation); } @Override public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) { - return newEntityData(19, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightArmRotation.getX(), rightArmRotation.getY(), rightArmRotation.getZ())); + return createRotations(19, rightArmRotation); } @Override public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) { - return newEntityData(20, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftLegRotation.getX(), leftLegRotation.getY(), leftLegRotation.getZ())); + return createRotations(20, leftLegRotation); } @Override public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) { - return newEntityData(21, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightLegRotation.getX(), rightLegRotation.getY(), rightLegRotation.getZ())); + return createRotations(21, rightLegRotation); } - - } 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 179cbec..6f6cfeb 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 @@ -66,32 +66,32 @@ public class V1_8MetadataFactory implements MetadataFactory { @Override public EntityData armorStandHeadRotation(Vector3f headRotation) { - return newEntityData(11, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(headRotation.getX(), headRotation.getY(), headRotation.getZ())); + return createRotations(11, headRotation); } @Override public EntityData armorStandBodyRotation(Vector3f bodyRotation) { - return newEntityData(12, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(bodyRotation.getX(), bodyRotation.getY(), bodyRotation.getZ())); + return createRotations(12, bodyRotation); } @Override public EntityData armorStandLeftArmRotation(Vector3f leftArmRotation) { - return newEntityData(13, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftArmRotation.getX(), leftArmRotation.getY(), leftArmRotation.getZ())); + return createRotations(13, leftArmRotation); } @Override public EntityData armorStandRightArmRotation(Vector3f rightArmRotation) { - return newEntityData(14, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightArmRotation.getX(), rightArmRotation.getY(), rightArmRotation.getZ())); + return createRotations(14, rightArmRotation); } @Override public EntityData armorStandLeftLegRotation(Vector3f leftLegRotation) { - return newEntityData(15, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(leftLegRotation.getX(), leftLegRotation.getY(), leftLegRotation.getZ())); + return createRotations(15, leftLegRotation); } @Override public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) { - return newEntityData(16, EntityDataTypes.ROTATION, new com.github.retrooper.packetevents.util.Vector3f(rightLegRotation.getX(), rightLegRotation.getY(), rightLegRotation.getZ())); + return createRotations(16, rightLegRotation); } @Override @@ -114,4 +114,8 @@ public class V1_8MetadataFactory implements MetadataFactory { 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 index 8048798..a1bb1f8 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 @@ -13,7 +13,13 @@ public class V1_9MetadataFactory extends V1_8MetadataFactory { @Override public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean usingItemLegacy) { - return newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (usingItemLegacy ? 0x10 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0))); + return newEntityData(0, EntityDataTypes.BYTE, (byte) ( + (onFire ? 0x01 : 0) | + (usingItemLegacy ? 0x10 : 0) | + (invisible ? 0x20 : 0) | + (glowing ? 0x40 : 0) | + (usingElytra ? 0x80 : 0) + )); } @Override