From f1b7cbf444a208671297cf475933776ab5ea01c8 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sat, 11 Sep 2021 02:43:42 +1200 Subject: [PATCH] Rename methods again, fix a equipment not blocking properly --- .../libraryaddict/disguise/DisguiseAPI.java | 6 ++--- .../disguise/disguisetypes/FlagWatcher.java | 9 +++---- .../disguisetypes/watchers/LivingWatcher.java | 26 +++++++++---------- .../PacketHandlerEquipment.java | 12 ++++++--- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java b/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java index 91fd8d5a..3e8aabb5 100644 --- a/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java +++ b/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java @@ -150,7 +150,7 @@ public class DisguiseAPI { watcher.setSwimming(watcher.isSwimming() && displayExtraAnimations); if (!NmsVersion.v1_13.isSupported()) { - watcher.setRightHandRaised(watcher.isRightHandRaised() && displayExtraAnimations); + watcher.setMainHandRaised(watcher.isMainHandRaised() && displayExtraAnimations); } if (!displayExtraAnimations) { @@ -162,8 +162,8 @@ public class DisguiseAPI { } else if (index == MetaIndex.LIVING_META && NmsVersion.v1_13.isSupported()) { LivingWatcher livingWatcher = (LivingWatcher) watcher; - livingWatcher.setRightHandRaised(livingWatcher.isRightHandRaised() && displayExtraAnimations); - livingWatcher.setLeftHandRaised(livingWatcher.isLeftHandRaised() && displayExtraAnimations); + livingWatcher.setMainHandRaised(livingWatcher.isMainHandRaised() && displayExtraAnimations); + livingWatcher.setOffhandRaised(livingWatcher.isOffhandRaised() && displayExtraAnimations); livingWatcher.setSpinning(livingWatcher.isSpinning() && displayExtraAnimations); if (!displayExtraAnimations) { diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java index 156b52a1..dfac71f6 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java @@ -20,7 +20,6 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.LibsPremium; import me.libraryaddict.disguise.utilities.parser.RandomDefaultValue; import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn; -import me.libraryaddict.disguise.utilities.reflection.NmsRemovedIn; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import net.md_5.bungee.api.chat.BaseComponent; @@ -764,22 +763,22 @@ public class FlagWatcher { @Deprecated @NmsAddedIn(NmsVersion.v1_12) public boolean isRightClicking() { - return isRightHandRaised(); + return isMainHandRaised(); } @Deprecated @NmsAddedIn(NmsVersion.v1_12) public void setRightClicking(boolean rightClicking) { - setRightHandRaised(rightClicking); + setMainHandRaised(rightClicking); } //@NmsRemovedIn(val = NmsVersion.v1_13) - public boolean isRightHandRaised() { + public boolean isMainHandRaised() { return !NmsVersion.v1_13.isSupported() && getEntityFlag(4); } //@NmsRemovedIn(val = NmsVersion.v1_13) - public void setRightHandRaised(boolean setRightClicking) { + public void setMainHandRaised(boolean setRightClicking) { if (NmsVersion.v1_13.isSupported()) { return; } diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java index 244f1edc..7fe69801 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java @@ -99,39 +99,39 @@ public class LivingWatcher extends FlagWatcher { sendData(MetaIndex.LIVING_META); } - private boolean isRightHandInUse() { - return getHandFlag(1); + private boolean isMainHandUsed() { + return !getHandFlag(1); } - private void setHandInUse(boolean rightHand) { - if (isRightHandInUse() == rightHand) { + private void setHandInUse(boolean mainHand) { + if (isMainHandUsed() == mainHand) { return; } - setHandFlag(1, rightHand); + setHandFlag(1, !mainHand); } @Override @NmsAddedIn(NmsVersion.v1_13) - public boolean isRightHandRaised() { - return isRightHandInUse() && getHandFlag(0); + public boolean isMainHandRaised() { + return isMainHandUsed() && getHandFlag(0); } @Override @NmsAddedIn(NmsVersion.v1_13) - public void setRightHandRaised(boolean setRightClicking) { + public void setMainHandRaised(boolean setRightClicking) { setHandInUse(true); setHandFlag(0, setRightClicking); } @NmsAddedIn(NmsVersion.v1_13) - public boolean isLeftHandRaised() { - return !isRightHandInUse() && getHandFlag(0); + public boolean isOffhandRaised() { + return !isMainHandUsed() && getHandFlag(0); } @NmsAddedIn(NmsVersion.v1_13) - public void setLeftHandRaised(boolean setLeftClicking) { + public void setOffhandRaised(boolean setLeftClicking) { setHandInUse(false); setHandFlag(0, setLeftClicking); @@ -314,12 +314,12 @@ public class LivingWatcher extends FlagWatcher { @Deprecated @NmsAddedIn(NmsVersion.v1_12) public boolean isRightClicking() { - return isRightHandRaised(); + return isMainHandRaised(); } @Deprecated @NmsAddedIn(NmsVersion.v1_12) public void setRightClicking(boolean rightClicking) { - setRightHandRaised(rightClicking); + setMainHandRaised(rightClicking); } } diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java index 1f71108d..e2e50678 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java @@ -81,14 +81,16 @@ public class PacketHandlerEquipment implements IPacketHandler { itemStack = ReflectionManager.getBukkitItem(pair.getSecond()); } - if ((disguise.getWatcher().isRightHandRaised() || (disguise.getWatcher() instanceof LivingWatcher && ((LivingWatcher) disguise.getWatcher()).isLeftHandRaised())) && (slot == EquipmentSlot.HAND || slot == EquipmentSlot.OFF_HAND)) { + if ((disguise.getWatcher().isMainHandRaised() && slot == EquipmentSlot.HAND) || + (disguise.getWatcher() instanceof LivingWatcher && ((LivingWatcher) disguise.getWatcher()).isOffhandRaised() && + slot == EquipmentSlot.OFF_HAND)) { if (itemStack != null && itemStack.getType() != Material.AIR) { // Convert the datawatcher List list = new ArrayList<>(); if (DisguiseConfig.isMetaPacketsEnabled()) { - WrappedWatchableObject watch = ReflectionManager - .createWatchable(MetaIndex.LIVING_META, WrappedDataWatcher.getEntityWatcher(entity).getByte(MetaIndex.LIVING_META.getIndex())); + WrappedWatchableObject watch = ReflectionManager.createWatchable(MetaIndex.LIVING_META, + WrappedDataWatcher.getEntityWatcher(entity).getByte(MetaIndex.LIVING_META.getIndex())); if (watch != null) { list.add(watch); @@ -152,7 +154,9 @@ public class PacketHandlerEquipment implements IPacketHandler { equipPacket.getModifier().write(2, ReflectionManager.getNmsItem(itemStack.getType() == Material.AIR ? null : itemStack)); } - if ((disguise.getWatcher().isRightHandRaised() || (disguise.getWatcher() instanceof LivingWatcher && ((LivingWatcher) disguise.getWatcher()).isLeftHandRaised())) && (slot == EquipmentSlot.HAND || slot == EquipmentSlot.OFF_HAND)) { + if ((disguise.getWatcher().isMainHandRaised() && slot == EquipmentSlot.HAND) || + (disguise.getWatcher() instanceof LivingWatcher && ((LivingWatcher) disguise.getWatcher()).isOffhandRaised() && + slot == EquipmentSlot.OFF_HAND)) { if (itemStack == null) { itemStack = packets.getPackets().get(0).getItemModifier().read(0); }