From b8e79b20cffe5e601ceeecad7e11875767014481 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 1 Jan 2023 15:26:35 +0800 Subject: [PATCH] Implement API, check for invalid Player references, remove Text min/max-cooldown settings and fix Text delay/right click cancellations, make SitTrait work with npc#teleport --- main/lib/Vault.jar | Bin 296909 -> 0 bytes .../java/net/citizensnpcs/EventListen.java | 16 +-- .../main/java/net/citizensnpcs/Settings.java | 2 - .../citizensnpcs/commands/NPCCommands.java | 105 +++++++------- .../commands/WaypointCommands.java | 10 +- .../net/citizensnpcs/npc/CitizensNPC.java | 42 ++++-- .../npc/ai/AStarNavigationStrategy.java | 133 ++++++++++-------- .../npc/ai/CitizensNavigator.java | 24 +++- .../citizensnpcs/trait/ArmorStandTrait.java | 4 +- .../citizensnpcs/trait/ScoreboardTrait.java | 10 +- .../net/citizensnpcs/trait/ShopTrait.java | 10 +- .../net/citizensnpcs/trait/SneakTrait.java | 6 +- .../net/citizensnpcs/trait/text/Text.java | 50 +++---- .../main/java/net/citizensnpcs/util/NMS.java | 5 +- .../java/net/citizensnpcs/util/NMSBridge.java | 18 +-- .../citizensnpcs/util/PlayerUpdateTask.java | 43 ++++-- .../main/java/net/citizensnpcs/util/Util.java | 2 +- .../src/main/resources/messages_en.properties | 2 +- .../nms/v1_10_R1/entity/BatController.java | 8 +- .../nms/v1_10_R1/entity/BlazeController.java | 8 +- .../v1_10_R1/entity/CaveSpiderController.java | 8 +- .../v1_10_R1/entity/ChickenController.java | 8 +- .../nms/v1_10_R1/entity/CowController.java | 8 +- .../v1_10_R1/entity/CreeperController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_10_R1/entity/EndermanController.java | 8 +- .../v1_10_R1/entity/EndermiteController.java | 8 +- .../nms/v1_10_R1/entity/EntityHumanNPC.java | 23 +-- .../nms/v1_10_R1/entity/GhastController.java | 8 +- .../nms/v1_10_R1/entity/GiantController.java | 8 +- .../v1_10_R1/entity/GuardianController.java | 8 +- .../nms/v1_10_R1/entity/HorseController.java | 8 +- .../v1_10_R1/entity/IronGolemController.java | 8 +- .../v1_10_R1/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_10_R1/entity/OcelotController.java | 8 +- .../nms/v1_10_R1/entity/PigController.java | 8 +- .../v1_10_R1/entity/PigZombieController.java | 8 +- .../v1_10_R1/entity/PolarBearController.java | 8 +- .../nms/v1_10_R1/entity/RabbitController.java | 8 +- .../nms/v1_10_R1/entity/SheepController.java | 8 +- .../v1_10_R1/entity/ShulkerController.java | 8 +- .../v1_10_R1/entity/SilverfishController.java | 8 +- .../v1_10_R1/entity/SkeletonController.java | 8 +- .../nms/v1_10_R1/entity/SlimeController.java | 8 +- .../v1_10_R1/entity/SnowmanController.java | 8 +- .../nms/v1_10_R1/entity/SpiderController.java | 8 +- .../nms/v1_10_R1/entity/SquidController.java | 8 +- .../v1_10_R1/entity/VillagerController.java | 10 +- .../nms/v1_10_R1/entity/WitchController.java | 8 +- .../nms/v1_10_R1/entity/WitherController.java | 8 +- .../nms/v1_10_R1/entity/WolfController.java | 8 +- .../nms/v1_10_R1/entity/ZombieController.java | 8 +- .../nms/v1_10_R1/util/NMSImpl.java | 12 +- .../nms/v1_11_R1/entity/BatController.java | 8 +- .../nms/v1_11_R1/entity/BlazeController.java | 8 +- .../v1_11_R1/entity/CaveSpiderController.java | 8 +- .../v1_11_R1/entity/ChickenController.java | 8 +- .../nms/v1_11_R1/entity/CowController.java | 8 +- .../v1_11_R1/entity/CreeperController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_11_R1/entity/EndermanController.java | 8 +- .../v1_11_R1/entity/EndermiteController.java | 8 +- .../nms/v1_11_R1/entity/EntityHumanNPC.java | 18 +-- .../nms/v1_11_R1/entity/EvokerController.java | 8 +- .../nms/v1_11_R1/entity/GhastController.java | 8 +- .../nms/v1_11_R1/entity/GiantController.java | 8 +- .../v1_11_R1/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_11_R1/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_11_R1/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_11_R1/entity/IronGolemController.java | 8 +- .../nms/v1_11_R1/entity/LlamaController.java | 8 +- .../v1_11_R1/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_11_R1/entity/OcelotController.java | 8 +- .../nms/v1_11_R1/entity/PigController.java | 8 +- .../v1_11_R1/entity/PigZombieController.java | 8 +- .../v1_11_R1/entity/PolarBearController.java | 8 +- .../nms/v1_11_R1/entity/RabbitController.java | 8 +- .../nms/v1_11_R1/entity/SheepController.java | 8 +- .../v1_11_R1/entity/ShulkerController.java | 8 +- .../v1_11_R1/entity/SilverfishController.java | 8 +- .../v1_11_R1/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_11_R1/entity/SlimeController.java | 8 +- .../v1_11_R1/entity/SnowmanController.java | 8 +- .../nms/v1_11_R1/entity/SpiderController.java | 8 +- .../nms/v1_11_R1/entity/SquidController.java | 8 +- .../nms/v1_11_R1/entity/VexController.java | 8 +- .../v1_11_R1/entity/VillagerController.java | 10 +- .../v1_11_R1/entity/VindicatorController.java | 8 +- .../nms/v1_11_R1/entity/WitchController.java | 8 +- .../nms/v1_11_R1/entity/WitherController.java | 8 +- .../nms/v1_11_R1/entity/WolfController.java | 8 +- .../nms/v1_11_R1/entity/ZombieController.java | 8 +- .../v1_11_R1/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../nms/v1_11_R1/util/NMSImpl.java | 12 +- .../nms/v1_12_R1/entity/BatController.java | 8 +- .../nms/v1_12_R1/entity/BlazeController.java | 8 +- .../v1_12_R1/entity/CaveSpiderController.java | 8 +- .../v1_12_R1/entity/ChickenController.java | 8 +- .../nms/v1_12_R1/entity/CowController.java | 8 +- .../v1_12_R1/entity/CreeperController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_12_R1/entity/EndermanController.java | 8 +- .../v1_12_R1/entity/EndermiteController.java | 8 +- .../nms/v1_12_R1/entity/EntityHumanNPC.java | 18 +-- .../nms/v1_12_R1/entity/EvokerController.java | 8 +- .../nms/v1_12_R1/entity/GhastController.java | 8 +- .../nms/v1_12_R1/entity/GiantController.java | 8 +- .../v1_12_R1/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_12_R1/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_12_R1/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_12_R1/entity/IllusionerController.java | 8 +- .../v1_12_R1/entity/IronGolemController.java | 8 +- .../nms/v1_12_R1/entity/LlamaController.java | 8 +- .../v1_12_R1/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_12_R1/entity/OcelotController.java | 8 +- .../nms/v1_12_R1/entity/ParrotController.java | 8 +- .../nms/v1_12_R1/entity/PigController.java | 8 +- .../v1_12_R1/entity/PigZombieController.java | 8 +- .../v1_12_R1/entity/PolarBearController.java | 8 +- .../nms/v1_12_R1/entity/RabbitController.java | 8 +- .../nms/v1_12_R1/entity/SheepController.java | 8 +- .../v1_12_R1/entity/ShulkerController.java | 8 +- .../v1_12_R1/entity/SilverfishController.java | 8 +- .../v1_12_R1/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_12_R1/entity/SlimeController.java | 8 +- .../v1_12_R1/entity/SnowmanController.java | 8 +- .../nms/v1_12_R1/entity/SpiderController.java | 8 +- .../nms/v1_12_R1/entity/SquidController.java | 8 +- .../nms/v1_12_R1/entity/VexController.java | 8 +- .../v1_12_R1/entity/VillagerController.java | 10 +- .../v1_12_R1/entity/VindicatorController.java | 8 +- .../nms/v1_12_R1/entity/WitchController.java | 8 +- .../nms/v1_12_R1/entity/WitherController.java | 8 +- .../nms/v1_12_R1/entity/WolfController.java | 8 +- .../nms/v1_12_R1/entity/ZombieController.java | 8 +- .../v1_12_R1/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../nms/v1_12_R1/util/NMSImpl.java | 12 +- .../nms/v1_13_R2/entity/BatController.java | 8 +- .../nms/v1_13_R2/entity/BlazeController.java | 8 +- .../v1_13_R2/entity/CaveSpiderController.java | 8 +- .../v1_13_R2/entity/ChickenController.java | 8 +- .../nms/v1_13_R2/entity/CodController.java | 8 +- .../nms/v1_13_R2/entity/CowController.java | 8 +- .../v1_13_R2/entity/CreeperController.java | 8 +- .../v1_13_R2/entity/DolphinController.java | 8 +- .../v1_13_R2/entity/DrownedController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_13_R2/entity/EndermanController.java | 8 +- .../v1_13_R2/entity/EndermiteController.java | 8 +- .../nms/v1_13_R2/entity/EntityHumanNPC.java | 18 +-- .../nms/v1_13_R2/entity/EvokerController.java | 8 +- .../nms/v1_13_R2/entity/GhastController.java | 8 +- .../nms/v1_13_R2/entity/GiantController.java | 8 +- .../v1_13_R2/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_13_R2/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_13_R2/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_13_R2/entity/IllusionerController.java | 8 +- .../v1_13_R2/entity/IronGolemController.java | 8 +- .../nms/v1_13_R2/entity/LlamaController.java | 8 +- .../v1_13_R2/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_13_R2/entity/OcelotController.java | 8 +- .../nms/v1_13_R2/entity/ParrotController.java | 8 +- .../v1_13_R2/entity/PhantomController.java | 8 +- .../nms/v1_13_R2/entity/PigController.java | 8 +- .../v1_13_R2/entity/PigZombieController.java | 8 +- .../v1_13_R2/entity/PolarBearController.java | 8 +- .../v1_13_R2/entity/PufferFishController.java | 8 +- .../nms/v1_13_R2/entity/RabbitController.java | 8 +- .../nms/v1_13_R2/entity/SalmonController.java | 8 +- .../nms/v1_13_R2/entity/SheepController.java | 8 +- .../v1_13_R2/entity/ShulkerController.java | 8 +- .../v1_13_R2/entity/SilverfishController.java | 8 +- .../v1_13_R2/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_13_R2/entity/SlimeController.java | 8 +- .../v1_13_R2/entity/SnowmanController.java | 8 +- .../nms/v1_13_R2/entity/SpiderController.java | 8 +- .../nms/v1_13_R2/entity/SquidController.java | 8 +- .../entity/TropicalFishController.java | 8 +- .../nms/v1_13_R2/entity/TurtleController.java | 8 +- .../nms/v1_13_R2/entity/VexController.java | 8 +- .../v1_13_R2/entity/VillagerController.java | 10 +- .../v1_13_R2/entity/VindicatorController.java | 8 +- .../nms/v1_13_R2/entity/WitchController.java | 8 +- .../nms/v1_13_R2/entity/WitherController.java | 8 +- .../nms/v1_13_R2/entity/WolfController.java | 8 +- .../nms/v1_13_R2/entity/ZombieController.java | 8 +- .../v1_13_R2/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../nms/v1_13_R2/util/NMSImpl.java | 12 +- .../nms/v1_14_R1/entity/BatController.java | 8 +- .../nms/v1_14_R1/entity/BlazeController.java | 8 +- .../nms/v1_14_R1/entity/CatController.java | 8 +- .../v1_14_R1/entity/CaveSpiderController.java | 8 +- .../v1_14_R1/entity/ChickenController.java | 8 +- .../nms/v1_14_R1/entity/CodController.java | 8 +- .../nms/v1_14_R1/entity/CowController.java | 8 +- .../v1_14_R1/entity/CreeperController.java | 8 +- .../v1_14_R1/entity/DolphinController.java | 8 +- .../v1_14_R1/entity/DrownedController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_14_R1/entity/EndermanController.java | 8 +- .../v1_14_R1/entity/EndermiteController.java | 8 +- .../nms/v1_14_R1/entity/EntityHumanNPC.java | 18 +-- .../nms/v1_14_R1/entity/EvokerController.java | 8 +- .../nms/v1_14_R1/entity/FoxController.java | 8 +- .../nms/v1_14_R1/entity/GhastController.java | 8 +- .../nms/v1_14_R1/entity/GiantController.java | 8 +- .../v1_14_R1/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_14_R1/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_14_R1/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_14_R1/entity/IllusionerController.java | 8 +- .../v1_14_R1/entity/IronGolemController.java | 8 +- .../nms/v1_14_R1/entity/LlamaController.java | 8 +- .../v1_14_R1/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_14_R1/entity/OcelotController.java | 8 +- .../nms/v1_14_R1/entity/PandaController.java | 8 +- .../nms/v1_14_R1/entity/ParrotController.java | 8 +- .../v1_14_R1/entity/PhantomController.java | 8 +- .../nms/v1_14_R1/entity/PigController.java | 8 +- .../v1_14_R1/entity/PigZombieController.java | 8 +- .../v1_14_R1/entity/PillagerController.java | 8 +- .../v1_14_R1/entity/PolarBearController.java | 8 +- .../v1_14_R1/entity/PufferFishController.java | 8 +- .../nms/v1_14_R1/entity/RabbitController.java | 8 +- .../v1_14_R1/entity/RavagerController.java | 8 +- .../nms/v1_14_R1/entity/SalmonController.java | 8 +- .../nms/v1_14_R1/entity/SheepController.java | 8 +- .../v1_14_R1/entity/ShulkerController.java | 8 +- .../v1_14_R1/entity/SilverfishController.java | 8 +- .../v1_14_R1/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_14_R1/entity/SlimeController.java | 8 +- .../v1_14_R1/entity/SnowmanController.java | 8 +- .../nms/v1_14_R1/entity/SpiderController.java | 8 +- .../nms/v1_14_R1/entity/SquidController.java | 8 +- .../entity/TraderLlamaController.java | 8 +- .../entity/TropicalFishController.java | 8 +- .../nms/v1_14_R1/entity/TurtleController.java | 8 +- .../nms/v1_14_R1/entity/VexController.java | 8 +- .../v1_14_R1/entity/VillagerController.java | 10 +- .../v1_14_R1/entity/VindicatorController.java | 8 +- .../entity/WanderingTraderController.java | 8 +- .../nms/v1_14_R1/entity/WitchController.java | 8 +- .../nms/v1_14_R1/entity/WitherController.java | 8 +- .../nms/v1_14_R1/entity/WolfController.java | 8 +- .../nms/v1_14_R1/entity/ZombieController.java | 8 +- .../v1_14_R1/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../nms/v1_14_R1/util/NMSImpl.java | 12 +- .../nms/v1_15_R1/entity/BatController.java | 8 +- .../nms/v1_15_R1/entity/BeeController.java | 8 +- .../nms/v1_15_R1/entity/BlazeController.java | 8 +- .../nms/v1_15_R1/entity/CatController.java | 8 +- .../v1_15_R1/entity/CaveSpiderController.java | 8 +- .../v1_15_R1/entity/ChickenController.java | 8 +- .../nms/v1_15_R1/entity/CodController.java | 8 +- .../nms/v1_15_R1/entity/CowController.java | 8 +- .../v1_15_R1/entity/CreeperController.java | 8 +- .../v1_15_R1/entity/DolphinController.java | 8 +- .../v1_15_R1/entity/DrownedController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_15_R1/entity/EndermanController.java | 8 +- .../v1_15_R1/entity/EndermiteController.java | 8 +- .../nms/v1_15_R1/entity/EntityHumanNPC.java | 35 +---- .../nms/v1_15_R1/entity/EvokerController.java | 8 +- .../nms/v1_15_R1/entity/FoxController.java | 8 +- .../nms/v1_15_R1/entity/GhastController.java | 8 +- .../nms/v1_15_R1/entity/GiantController.java | 8 +- .../v1_15_R1/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_15_R1/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_15_R1/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_15_R1/entity/IllusionerController.java | 8 +- .../v1_15_R1/entity/IronGolemController.java | 8 +- .../nms/v1_15_R1/entity/LlamaController.java | 8 +- .../v1_15_R1/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_15_R1/entity/OcelotController.java | 8 +- .../nms/v1_15_R1/entity/PandaController.java | 8 +- .../nms/v1_15_R1/entity/ParrotController.java | 8 +- .../v1_15_R1/entity/PhantomController.java | 8 +- .../nms/v1_15_R1/entity/PigController.java | 8 +- .../v1_15_R1/entity/PigZombieController.java | 8 +- .../v1_15_R1/entity/PillagerController.java | 8 +- .../v1_15_R1/entity/PolarBearController.java | 8 +- .../v1_15_R1/entity/PufferFishController.java | 8 +- .../nms/v1_15_R1/entity/RabbitController.java | 8 +- .../v1_15_R1/entity/RavagerController.java | 8 +- .../nms/v1_15_R1/entity/SalmonController.java | 8 +- .../nms/v1_15_R1/entity/SheepController.java | 8 +- .../v1_15_R1/entity/ShulkerController.java | 8 +- .../v1_15_R1/entity/SilverfishController.java | 8 +- .../v1_15_R1/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_15_R1/entity/SlimeController.java | 8 +- .../v1_15_R1/entity/SnowmanController.java | 8 +- .../nms/v1_15_R1/entity/SpiderController.java | 8 +- .../nms/v1_15_R1/entity/SquidController.java | 8 +- .../entity/TraderLlamaController.java | 8 +- .../entity/TropicalFishController.java | 8 +- .../nms/v1_15_R1/entity/TurtleController.java | 8 +- .../nms/v1_15_R1/entity/VexController.java | 8 +- .../v1_15_R1/entity/VillagerController.java | 10 +- .../v1_15_R1/entity/VindicatorController.java | 8 +- .../entity/WanderingTraderController.java | 8 +- .../nms/v1_15_R1/entity/WitchController.java | 8 +- .../nms/v1_15_R1/entity/WitherController.java | 8 +- .../nms/v1_15_R1/entity/WolfController.java | 8 +- .../nms/v1_15_R1/entity/ZombieController.java | 8 +- .../v1_15_R1/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../nms/v1_15_R1/util/NMSImpl.java | 12 +- .../nms/v1_16_R3/entity/BatController.java | 8 +- .../nms/v1_16_R3/entity/BeeController.java | 8 +- .../nms/v1_16_R3/entity/BlazeController.java | 8 +- .../nms/v1_16_R3/entity/CatController.java | 8 +- .../v1_16_R3/entity/CaveSpiderController.java | 8 +- .../v1_16_R3/entity/ChickenController.java | 8 +- .../nms/v1_16_R3/entity/CodController.java | 8 +- .../nms/v1_16_R3/entity/CowController.java | 8 +- .../v1_16_R3/entity/CreeperController.java | 8 +- .../v1_16_R3/entity/DolphinController.java | 8 +- .../v1_16_R3/entity/DrownedController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_16_R3/entity/EndermanController.java | 8 +- .../v1_16_R3/entity/EndermiteController.java | 8 +- .../nms/v1_16_R3/entity/EntityHumanNPC.java | 25 +--- .../nms/v1_16_R3/entity/EvokerController.java | 8 +- .../nms/v1_16_R3/entity/FoxController.java | 8 +- .../nms/v1_16_R3/entity/GhastController.java | 8 +- .../nms/v1_16_R3/entity/GiantController.java | 8 +- .../v1_16_R3/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_16_R3/entity/HoglinController.java | 8 +- .../nms/v1_16_R3/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_16_R3/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_16_R3/entity/IllusionerController.java | 8 +- .../v1_16_R3/entity/IronGolemController.java | 8 +- .../nms/v1_16_R3/entity/LlamaController.java | 8 +- .../v1_16_R3/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_16_R3/entity/OcelotController.java | 8 +- .../nms/v1_16_R3/entity/PandaController.java | 8 +- .../nms/v1_16_R3/entity/ParrotController.java | 8 +- .../v1_16_R3/entity/PhantomController.java | 8 +- .../nms/v1_16_R3/entity/PigController.java | 8 +- .../v1_16_R3/entity/PigZombieController.java | 8 +- .../entity/PiglinBruteController.java | 8 +- .../nms/v1_16_R3/entity/PiglinController.java | 8 +- .../v1_16_R3/entity/PillagerController.java | 8 +- .../v1_16_R3/entity/PolarBearController.java | 8 +- .../v1_16_R3/entity/PufferFishController.java | 8 +- .../nms/v1_16_R3/entity/RabbitController.java | 8 +- .../v1_16_R3/entity/RavagerController.java | 8 +- .../nms/v1_16_R3/entity/SalmonController.java | 8 +- .../nms/v1_16_R3/entity/SheepController.java | 8 +- .../v1_16_R3/entity/ShulkerController.java | 8 +- .../v1_16_R3/entity/SilverfishController.java | 8 +- .../v1_16_R3/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_16_R3/entity/SlimeController.java | 8 +- .../v1_16_R3/entity/SnowmanController.java | 8 +- .../nms/v1_16_R3/entity/SpiderController.java | 8 +- .../nms/v1_16_R3/entity/SquidController.java | 8 +- .../v1_16_R3/entity/StriderController.java | 8 +- .../entity/TraderLlamaController.java | 8 +- .../entity/TropicalFishController.java | 8 +- .../nms/v1_16_R3/entity/TurtleController.java | 8 +- .../nms/v1_16_R3/entity/VexController.java | 8 +- .../v1_16_R3/entity/VillagerController.java | 10 +- .../v1_16_R3/entity/VindicatorController.java | 8 +- .../entity/WanderingTraderController.java | 8 +- .../nms/v1_16_R3/entity/WitchController.java | 8 +- .../nms/v1_16_R3/entity/WitherController.java | 8 +- .../nms/v1_16_R3/entity/WolfController.java | 8 +- .../nms/v1_16_R3/entity/ZoglinController.java | 8 +- .../nms/v1_16_R3/entity/ZombieController.java | 8 +- .../v1_16_R3/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../nms/v1_16_R3/util/NMSImpl.java | 12 +- .../v1_17_R1/entity/AxolotlController.java | 8 +- .../nms/v1_17_R1/entity/BatController.java | 8 +- .../nms/v1_17_R1/entity/BeeController.java | 8 +- .../nms/v1_17_R1/entity/BlazeController.java | 8 +- .../nms/v1_17_R1/entity/CatController.java | 8 +- .../v1_17_R1/entity/CaveSpiderController.java | 8 +- .../v1_17_R1/entity/ChickenController.java | 8 +- .../nms/v1_17_R1/entity/CodController.java | 8 +- .../nms/v1_17_R1/entity/CowController.java | 8 +- .../v1_17_R1/entity/CreeperController.java | 8 +- .../v1_17_R1/entity/DolphinController.java | 8 +- .../v1_17_R1/entity/DrownedController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_17_R1/entity/EndermanController.java | 8 +- .../v1_17_R1/entity/EndermiteController.java | 8 +- .../nms/v1_17_R1/entity/EntityHumanNPC.java | 25 +--- .../nms/v1_17_R1/entity/EvokerController.java | 8 +- .../nms/v1_17_R1/entity/FoxController.java | 8 +- .../nms/v1_17_R1/entity/GhastController.java | 8 +- .../nms/v1_17_R1/entity/GiantController.java | 8 +- .../v1_17_R1/entity/GlowSquidController.java | 8 +- .../nms/v1_17_R1/entity/GoatController.java | 8 +- .../v1_17_R1/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_17_R1/entity/HoglinController.java | 8 +- .../nms/v1_17_R1/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_17_R1/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../v1_17_R1/entity/IllusionerController.java | 8 +- .../v1_17_R1/entity/IronGolemController.java | 8 +- .../nms/v1_17_R1/entity/LlamaController.java | 8 +- .../v1_17_R1/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_17_R1/entity/OcelotController.java | 8 +- .../nms/v1_17_R1/entity/PandaController.java | 8 +- .../nms/v1_17_R1/entity/ParrotController.java | 8 +- .../v1_17_R1/entity/PhantomController.java | 8 +- .../nms/v1_17_R1/entity/PigController.java | 8 +- .../v1_17_R1/entity/PigZombieController.java | 8 +- .../entity/PiglinBruteController.java | 8 +- .../nms/v1_17_R1/entity/PiglinController.java | 8 +- .../v1_17_R1/entity/PillagerController.java | 8 +- .../v1_17_R1/entity/PolarBearController.java | 8 +- .../v1_17_R1/entity/PufferFishController.java | 8 +- .../nms/v1_17_R1/entity/RabbitController.java | 8 +- .../v1_17_R1/entity/RavagerController.java | 8 +- .../nms/v1_17_R1/entity/SalmonController.java | 8 +- .../nms/v1_17_R1/entity/SheepController.java | 8 +- .../v1_17_R1/entity/ShulkerController.java | 8 +- .../v1_17_R1/entity/SilverfishController.java | 8 +- .../v1_17_R1/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_17_R1/entity/SlimeController.java | 8 +- .../v1_17_R1/entity/SnowmanController.java | 8 +- .../nms/v1_17_R1/entity/SpiderController.java | 8 +- .../nms/v1_17_R1/entity/SquidController.java | 8 +- .../v1_17_R1/entity/StriderController.java | 8 +- .../entity/TraderLlamaController.java | 8 +- .../entity/TropicalFishController.java | 8 +- .../nms/v1_17_R1/entity/TurtleController.java | 8 +- .../nms/v1_17_R1/entity/VexController.java | 8 +- .../v1_17_R1/entity/VillagerController.java | 10 +- .../v1_17_R1/entity/VindicatorController.java | 8 +- .../entity/WanderingTraderController.java | 8 +- .../nms/v1_17_R1/entity/WitchController.java | 8 +- .../nms/v1_17_R1/entity/WitherController.java | 8 +- .../nms/v1_17_R1/entity/WolfController.java | 8 +- .../nms/v1_17_R1/entity/ZoglinController.java | 8 +- .../nms/v1_17_R1/entity/ZombieController.java | 8 +- .../v1_17_R1/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../v1_17_R1/util/CitizensBlockBreaker.java | 1 - .../nms/v1_17_R1/util/NMSImpl.java | 12 +- .../v1_18_R2/entity/AxolotlController.java | 8 +- .../nms/v1_18_R2/entity/BatController.java | 8 +- .../nms/v1_18_R2/entity/BeeController.java | 8 +- .../nms/v1_18_R2/entity/BlazeController.java | 8 +- .../nms/v1_18_R2/entity/CatController.java | 8 +- .../v1_18_R2/entity/CaveSpiderController.java | 8 +- .../v1_18_R2/entity/ChickenController.java | 8 +- .../nms/v1_18_R2/entity/CodController.java | 8 +- .../nms/v1_18_R2/entity/CowController.java | 8 +- .../v1_18_R2/entity/CreeperController.java | 8 +- .../v1_18_R2/entity/DolphinController.java | 8 +- .../v1_18_R2/entity/DrownedController.java | 8 +- .../entity/EnderDragonController.java | 8 +- .../v1_18_R2/entity/EndermanController.java | 8 +- .../v1_18_R2/entity/EndermiteController.java | 8 +- .../nms/v1_18_R2/entity/EntityHumanNPC.java | 25 +--- .../nms/v1_18_R2/entity/EvokerController.java | 8 +- .../nms/v1_18_R2/entity/FoxController.java | 8 +- .../nms/v1_18_R2/entity/GhastController.java | 8 +- .../nms/v1_18_R2/entity/GiantController.java | 8 +- .../v1_18_R2/entity/GlowSquidController.java | 8 +- .../nms/v1_18_R2/entity/GoatController.java | 8 +- .../v1_18_R2/entity/GuardianController.java | 8 +- .../entity/GuardianElderController.java | 8 +- .../nms/v1_18_R2/entity/HoglinController.java | 8 +- .../nms/v1_18_R2/entity/HorseController.java | 8 +- .../entity/HorseDonkeyController.java | 8 +- .../v1_18_R2/entity/HorseMuleController.java | 8 +- .../entity/HorseSkeletonController.java | 8 +- .../entity/HorseZombieController.java | 8 +- .../nms/v1_18_R2/entity/HumanController.java | 2 +- .../v1_18_R2/entity/IllusionerController.java | 8 +- .../v1_18_R2/entity/IronGolemController.java | 8 +- .../nms/v1_18_R2/entity/LlamaController.java | 8 +- .../v1_18_R2/entity/MagmaCubeController.java | 8 +- .../entity/MushroomCowController.java | 8 +- .../nms/v1_18_R2/entity/OcelotController.java | 8 +- .../nms/v1_18_R2/entity/PandaController.java | 8 +- .../nms/v1_18_R2/entity/ParrotController.java | 8 +- .../v1_18_R2/entity/PhantomController.java | 8 +- .../nms/v1_18_R2/entity/PigController.java | 8 +- .../v1_18_R2/entity/PigZombieController.java | 8 +- .../entity/PiglinBruteController.java | 8 +- .../nms/v1_18_R2/entity/PiglinController.java | 8 +- .../v1_18_R2/entity/PillagerController.java | 8 +- .../v1_18_R2/entity/PolarBearController.java | 8 +- .../v1_18_R2/entity/PufferFishController.java | 8 +- .../nms/v1_18_R2/entity/RabbitController.java | 8 +- .../v1_18_R2/entity/RavagerController.java | 8 +- .../nms/v1_18_R2/entity/SalmonController.java | 8 +- .../nms/v1_18_R2/entity/SheepController.java | 8 +- .../v1_18_R2/entity/ShulkerController.java | 8 +- .../v1_18_R2/entity/SilverfishController.java | 8 +- .../v1_18_R2/entity/SkeletonController.java | 8 +- .../entity/SkeletonStrayController.java | 8 +- .../entity/SkeletonWitherController.java | 8 +- .../nms/v1_18_R2/entity/SlimeController.java | 8 +- .../v1_18_R2/entity/SnowmanController.java | 8 +- .../nms/v1_18_R2/entity/SpiderController.java | 8 +- .../nms/v1_18_R2/entity/SquidController.java | 8 +- .../v1_18_R2/entity/StriderController.java | 8 +- .../entity/TraderLlamaController.java | 8 +- .../entity/TropicalFishController.java | 8 +- .../nms/v1_18_R2/entity/TurtleController.java | 8 +- .../nms/v1_18_R2/entity/VexController.java | 8 +- .../v1_18_R2/entity/VillagerController.java | 10 +- .../v1_18_R2/entity/VindicatorController.java | 8 +- .../entity/WanderingTraderController.java | 8 +- .../nms/v1_18_R2/entity/WitchController.java | 8 +- .../nms/v1_18_R2/entity/WitherController.java | 8 +- .../nms/v1_18_R2/entity/WolfController.java | 8 +- .../nms/v1_18_R2/entity/ZoglinController.java | 8 +- .../nms/v1_18_R2/entity/ZombieController.java | 8 +- .../v1_18_R2/entity/ZombieHuskController.java | 8 +- .../entity/ZombieVillagerController.java | 8 +- .../v1_18_R2/util/CitizensBlockBreaker.java | 1 - .../nms/v1_18_R2/util/NMSImpl.java | 14 +- .../nms/v1_19_R2/entity/AllayController.java | 6 +- .../v1_19_R2/entity/AxolotlController.java | 6 +- .../nms/v1_19_R2/entity/BatController.java | 6 +- .../nms/v1_19_R2/entity/BeeController.java | 6 +- .../nms/v1_19_R2/entity/BlazeController.java | 6 +- .../nms/v1_19_R2/entity/CamelController.java | 6 +- .../nms/v1_19_R2/entity/CatController.java | 6 +- .../v1_19_R2/entity/CaveSpiderController.java | 6 +- .../v1_19_R2/entity/ChickenController.java | 6 +- .../nms/v1_19_R2/entity/CodController.java | 6 +- .../nms/v1_19_R2/entity/CowController.java | 6 +- .../v1_19_R2/entity/CreeperController.java | 6 +- .../v1_19_R2/entity/DolphinController.java | 6 +- .../v1_19_R2/entity/DrownedController.java | 6 +- .../entity/EnderDragonController.java | 6 +- .../v1_19_R2/entity/EndermanController.java | 6 +- .../v1_19_R2/entity/EndermiteController.java | 6 +- .../nms/v1_19_R2/entity/EntityHumanNPC.java | 27 ++-- .../nms/v1_19_R2/entity/EvokerController.java | 6 +- .../nms/v1_19_R2/entity/FoxController.java | 6 +- .../nms/v1_19_R2/entity/FrogController.java | 6 +- .../nms/v1_19_R2/entity/GhastController.java | 6 +- .../nms/v1_19_R2/entity/GiantController.java | 6 +- .../v1_19_R2/entity/GlowSquidController.java | 6 +- .../nms/v1_19_R2/entity/GoatController.java | 6 +- .../v1_19_R2/entity/GuardianController.java | 6 +- .../entity/GuardianElderController.java | 6 +- .../nms/v1_19_R2/entity/HoglinController.java | 6 +- .../nms/v1_19_R2/entity/HorseController.java | 6 +- .../entity/HorseDonkeyController.java | 6 +- .../v1_19_R2/entity/HorseMuleController.java | 6 +- .../entity/HorseSkeletonController.java | 6 +- .../entity/HorseZombieController.java | 6 +- .../nms/v1_19_R2/entity/HumanController.java | 2 +- .../v1_19_R2/entity/IllusionerController.java | 6 +- .../v1_19_R2/entity/IronGolemController.java | 6 +- .../nms/v1_19_R2/entity/LlamaController.java | 6 +- .../v1_19_R2/entity/MagmaCubeController.java | 6 +- .../entity/MushroomCowController.java | 6 +- .../nms/v1_19_R2/entity/OcelotController.java | 6 +- .../nms/v1_19_R2/entity/PandaController.java | 6 +- .../nms/v1_19_R2/entity/ParrotController.java | 6 +- .../v1_19_R2/entity/PhantomController.java | 6 +- .../nms/v1_19_R2/entity/PigController.java | 6 +- .../v1_19_R2/entity/PigZombieController.java | 6 +- .../entity/PiglinBruteController.java | 6 +- .../nms/v1_19_R2/entity/PiglinController.java | 6 +- .../v1_19_R2/entity/PillagerController.java | 6 +- .../v1_19_R2/entity/PolarBearController.java | 6 +- .../v1_19_R2/entity/PufferFishController.java | 6 +- .../nms/v1_19_R2/entity/RabbitController.java | 6 +- .../v1_19_R2/entity/RavagerController.java | 6 +- .../nms/v1_19_R2/entity/SalmonController.java | 6 +- .../nms/v1_19_R2/entity/SheepController.java | 6 +- .../v1_19_R2/entity/ShulkerController.java | 6 +- .../v1_19_R2/entity/SilverfishController.java | 6 +- .../v1_19_R2/entity/SkeletonController.java | 6 +- .../entity/SkeletonStrayController.java | 6 +- .../entity/SkeletonWitherController.java | 6 +- .../nms/v1_19_R2/entity/SlimeController.java | 6 +- .../v1_19_R2/entity/SnowmanController.java | 6 +- .../nms/v1_19_R2/entity/SpiderController.java | 6 +- .../nms/v1_19_R2/entity/SquidController.java | 6 +- .../v1_19_R2/entity/StriderController.java | 6 +- .../v1_19_R2/entity/TadpoleController.java | 6 +- .../entity/TraderLlamaController.java | 6 +- .../entity/TropicalFishController.java | 6 +- .../nms/v1_19_R2/entity/TurtleController.java | 6 +- .../nms/v1_19_R2/entity/VexController.java | 6 +- .../v1_19_R2/entity/VillagerController.java | 8 +- .../v1_19_R2/entity/VindicatorController.java | 6 +- .../entity/WanderingTraderController.java | 6 +- .../nms/v1_19_R2/entity/WardenController.java | 6 +- .../nms/v1_19_R2/entity/WitchController.java | 6 +- .../nms/v1_19_R2/entity/WitherController.java | 6 +- .../nms/v1_19_R2/entity/WolfController.java | 6 +- .../nms/v1_19_R2/entity/ZoglinController.java | 6 +- .../nms/v1_19_R2/entity/ZombieController.java | 6 +- .../v1_19_R2/entity/ZombieHuskController.java | 6 +- .../entity/ZombieVillagerController.java | 6 +- .../v1_19_R2/util/CitizensBlockBreaker.java | 1 - .../nms/v1_19_R2/util/NMSImpl.java | 20 +-- .../nms/v1_8_R3/entity/BatController.java | 8 +- .../nms/v1_8_R3/entity/BlazeController.java | 8 +- .../v1_8_R3/entity/CaveSpiderController.java | 8 +- .../nms/v1_8_R3/entity/ChickenController.java | 8 +- .../nms/v1_8_R3/entity/CowController.java | 8 +- .../nms/v1_8_R3/entity/CreeperController.java | 8 +- .../v1_8_R3/entity/EnderDragonController.java | 8 +- .../v1_8_R3/entity/EndermanController.java | 8 +- .../v1_8_R3/entity/EndermiteController.java | 8 +- .../nms/v1_8_R3/entity/EntityHumanNPC.java | 23 +-- .../nms/v1_8_R3/entity/GhastController.java | 8 +- .../nms/v1_8_R3/entity/GiantController.java | 8 +- .../v1_8_R3/entity/GuardianController.java | 8 +- .../nms/v1_8_R3/entity/HorseController.java | 8 +- .../nms/v1_8_R3/entity/HumanController.java | 2 +- .../v1_8_R3/entity/IronGolemController.java | 8 +- .../v1_8_R3/entity/MagmaCubeController.java | 8 +- .../v1_8_R3/entity/MushroomCowController.java | 8 +- .../nms/v1_8_R3/entity/OcelotController.java | 8 +- .../nms/v1_8_R3/entity/PigController.java | 8 +- .../v1_8_R3/entity/PigZombieController.java | 8 +- .../nms/v1_8_R3/entity/RabbitController.java | 8 +- .../nms/v1_8_R3/entity/SheepController.java | 8 +- .../v1_8_R3/entity/SilverfishController.java | 8 +- .../v1_8_R3/entity/SkeletonController.java | 8 +- .../nms/v1_8_R3/entity/SlimeController.java | 8 +- .../nms/v1_8_R3/entity/SnowmanController.java | 8 +- .../nms/v1_8_R3/entity/SpiderController.java | 8 +- .../nms/v1_8_R3/entity/SquidController.java | 8 +- .../v1_8_R3/entity/VillagerController.java | 10 +- .../nms/v1_8_R3/entity/WitchController.java | 8 +- .../nms/v1_8_R3/entity/WitherController.java | 8 +- .../nms/v1_8_R3/entity/WolfController.java | 8 +- .../nms/v1_8_R3/entity/ZombieController.java | 8 +- .../nms/v1_8_R3/util/NMSImpl.java | 12 +- 688 files changed, 2924 insertions(+), 2966 deletions(-) delete mode 100644 main/lib/Vault.jar diff --git a/main/lib/Vault.jar b/main/lib/Vault.jar deleted file mode 100644 index 63fc0427da0aba500aa9d884fc13396157ae12a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296909 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 MUWloJH zixlU)T^Dni?TvymHmw>iWRaK1hSPg%t*;1%7y&P)97r1ALf=d z-Ek6|4hNLX_D5?%)&-kSD?bry5<9G1JZyMYE?i~rCBS>9M|Fs6a8k&|U3u};G=)2* zecY{k6!a%~D`uNq|K!QEQQDQ@t#1HQxfNU6gwB5=+-rQZAKZl@Z^4I8+XO$WTuF?-u z&1RjTeA;YPWwD7?Le9j>vQSY_C^tvY8E zNFpk7cF9#QQX6UE)C#WVr*gjoOwt6Z$Xa45;NFJ#Sq#ZT_dG%yrBcMr?xp03ksqobZ=tMzTm?}W)UHu+q@q`80LDSH9m1=L06?O#8uk9uEznQ8^8*(cKp=CS zTe~{(Du*C?mtfXczcu*`sg)a4xMKm=X;2$VvH~F~w4RSz+2e!1-Mc`myx22sQi!fQ zEya_0r`v^SiKsk4`_vs{Ky@up35+tBdQA<|xU<3PSGv{tw8u^MQ$g(s!y(PtuDS4D zs+oK2wbr{-ntd%$$CJ5SObOZtU_-Tr?o$~(6QF(~F`@Ue^QFd(9wl~^Wn&Ep5S1Oc z1$w(zpXt_FQkyM1dOEc@V{d|$e$y_TpjG3TJjTTIQ@+xCkJUtWAoW3SqxKM$ti(sF zxv^H3R)M=u)#a}i8EaI#ii8lBVY)*AME!U71V z%^-f&Mih=oK6-qL43Ra@c2yQPHS(B6ZS7@Y;a8J)XCl+*ouCpM>7$>K+Z2Y{dOyn{ z?po@KHNp2K(aroTc2IY;6*PbS*4gXv$x>&RHv>i2fMdOyxqx4y5io_Csa zV1K)hwY%nNYn9%>wzbN9`pnypQkHkF^=95(mdUJiZFdW%V(BUF>}10=XHYF(bZYG( z%WU({p9~i6rE7#@>5~)0nc``;-Ctj8Z0&6=ZgugoiOyBPdO4jhm%?F9yVrOW1Bz;t zWYxU^DXJ76;^}xP2>H1gT+6r3xc=~Jhm!SXd$^r_TNH5_+e)FNi$lo;>`?0pf`3O@ zRSU33y{CF5%@McKpsW0JD`zZ+Y*i>a1J|9z5DOARq~r?i#CKg0h=;jUD3l%gs;I6N z2zD063rDS>^um7Vikd)9U<_&=(i;s-x}`jgHyi}46hhXn^?OkIt}Pa&-jYN(uNd-Q zG$K|n3qdz1cIM!&9`DOK^dzr&hlq86*aftr;3vGIi6-xnMoWyP zGH-biM(SU4nxJV&Q6f`vnS05e0b1j-XtAQcHigngU=JJGcxoPO`%_Ty(6W(K@!jBP znsIx9nTHjpfMS5>T!1)qT9l~}HrerxDW7hga}7A6nxnDj3!<_^?FL&%)kfnxwYLs5 zoUaLW%fahL@hfxxWw!?ldZf?g8`Ktq}Mg!;&55J%ENP>|KV8YB975L$aM}T zarLY{=(Tdfc~pdYDAg0~+LTJ8M(Ld_KB3P18wF|r+_Hjf&YvR(i6SR_e5lj*$D-Ev zpQt%<)mtyVeS1S!cqVR+rEreF$K~qwrG{B7heWqe z4dsX?`Mp@-GG90CG$33rp1_^Yf8#HSm`0kuf2GsH7r@E$#m9ix$P|5!-Mv~_nHqrZ zKB~nXeJk3iMIEJYZ;H_rSJh^#UQ(-DQkGgtk<7bqVa7Oi-MdGn3we^&SC5;4x53yY zx{wsJ+l34oBta0S_XislGYOp?^O~z2Dsj86aLm;`EzE{I$As5SgMKNi6Os$dNSfNG zl-k@qcJ=Yr*0o8Hre$CW_bW5D@T;6@z=X-qv3l0a!Qi(_cW8T930b6( zlD*owz3wZH- z$2mZEEhGD&(*-^j9t1w{Z$~~lvxA;&G+y}s>9tGc0$zW78=YD3{!J)Q{O@{gVS8I! zLpu{^QH_6B3I5j|0K`^26-{YNSr`k&2ANo*VMD1=0z{JpVv?9fbYQ0W596S-t61+cvJ(=6|8(7RlK1`(JZNPPm-8$BR{?%`33|*u;;;X zsc}gSlLVOU*2{%e7s!g*^wA);@_OtHE_fXBmfX zG_YRP!K@uApdzfvo&)pRE6kJw=Du6>Z*xUQt)SKVu?K8kgdE~UV-2bQa9y#>+Ig5ectd*xaaa-qcRG5P^@BFQ*`GC z>gcJI5v>5TcI~5r5A_h>8LtQ>bj^MQ#jD05Y-b&fE;pV`;;xNeG62_`$)mC4DC?u- zi_9pK3M4fX-&kdcI1`?+>>x7c#Y>RF#SbJl6Q4-gd(k#&sX%Y;qwf3I<0}qR_Xo_8 zfbz4z&O4oox|BQAaTh!;;oY}{t_Hlh%?Q|z2HZ_LENx;K-k<^_D>XsQ=^Lz0a${(t zpG%2G145Xa6cTHR0}a##5+yD$Z8o?>^dIp@@}#ab^nW@Obc*e|DZNo_WmjR-e-|op z#kytlh9G4^ABR_xJ6`jS&M7i#W7J;X@;2aF=H~+~|Du4( zNwCjTPIV*2oU|l8|C1Ez6TF}KTqW7XLfQoG>;l&6SvwfQX?l*f=Aj3qbt z2{p@0Y3^F`&CQJ0*uF~~1i2bnlg;{cTSN38ty2c8B7{}*lc8{`!XctYX+PZytPN5=d&*hDBg-b#Tu zx7N>~+7^UJP0(#tTh|)ajUu(%4WL4LA9s)eKPKQUF%ZCMX`4EXd*nHYE}}BuJjR(T zaV%l?g|ZqvWmS752cn!pAM7Q)R#LGYd1Tm`G^R&9PFYp3PA%6X?>Z7jM}NUCqd1%{ z-@)&U3{zHpFZ#VH)dL_eb}HDHF-60Tq9s$3n4`6Z-g0d zFMv@-f=9%m5k{O+ATU3p!B4wRS%d_zu;@x=&6mn%v9ZXCbDjQzO)!wzDrT`AKb6=h zCB{Ab{!(vW>D#{bb}eeAnQE`#f35U9djq_8z2$E&|Kj=L2q1qc2mWc#hJCKz55}|U z@3HfVu;sfP@a16qi9hhk!*?zSikA@>zYk!(h0JjPB-=a?Z2Clvm2JPk#LqTvOTzPo z&wAg2`pgF_za)X{o1wsaDnxs)AG2uZ8V+f)@l5~5GaTY%gK603!46w@C;)cknG8c@ z?;Qj%!k^!Ayx*&`(=|TSb=-l(*Ll}ZhWrf+ckxexO<%i3!Ok-qVz%*EiM3~H=^X)V z^7IZBaG|K8vT|Z1HWwwWP?ot$CbGZ@g$p@r3(1s~uz;Hj#X4)ud5Z8*fiZXHKr9IA zs2vQ*Ws%lo3TG0Lk;3UElMyboMbsif`ev_}Qd#P%Jn|Y535y(6h=jFc7FLb~^Jaee zX~JiP58#f9=yaQ$j~dFFtH^=@8h6sqAa@APeYMDZJp__nC7~D6i_3=>78(q)TVSq; zukU3Wi7v7^Y3}7|iv8dzcS=Vk$|~hF6FZqE@FX`$pGaVom&!BNh^?45wZroiJ%=lw zCk}I6bEAsElbs6t#Bn7+;-fM{@S0QFKuUwtis0iFoy z{CU`#hLfctg8#uG5H@Lv5=BZOJ0w8K1syTe^{={tX>bY{A}$UG;({@Rrv;@X>n6Ig za+kP79jFlDbFk!&Jv_oRnshZsEJ`tx|xwwjwcu=Z6;?HG|Y zdrfJs4ansa5c6(ESN-q~K6o1YFcgpsI79Ccydyu?nFBS`kBc5`ON zaRwe6t{u3Qu48SfL=}cYi^z1$7EuRyHY z7m~A@FJ#4P3?4|4dsG%COCS;<+KnaVEfv~J?UHmhXdRFs7g5n3E1!0~9ghcc@k z3hT&`N;@wiYrb#+EmO55>#k6pnE@#KmJEp20(CCT4Tx|{RNg9O(wq@$EvCxDN5230 z4mchk;)T#}*ic(ijh=c&H#L8nvi1#8=&BA;Q6)( zBz-Qpd*56qulioHW>pznbYtc{i%3}s?E(28ECM%TfeeiSz26966c|dVDREZLkxpGW*kljZ@Ps2-qdMxO6tBL2*a*|J zbTgpZ=Npko+@B!{sd}zK$LT&zz2!O-rH3CBWfUZ{&6=@ZCJgIEWE%GQQj$=v#8psl zor_%O~+stx}1?ckRy^$zaxPY;RPwzdTlA!^!MTwLxq zFpg{c_V)B0i1e3cd}+4QRh_LjTw91c^O#WKoo=D!f!UU=v2H`-gRI`(p+l~NOmQWT z*gii4m}m@AGu8CeJOphyYH%Iq@lmafW&dOyPn~H)Xj^oLxz!cn$Yt%~al|(Uth&M- z0bS$Z*f@Y;S+K%<0dL`mDa_*%P{|L0PCF3YLgdIBV%vhifd#rBgQ{>L=y^h_*LDX` z!I94)Xm}zvL7dZY+}Nxd-@0)}n!<$>PRF{Wd+H_{s=yoWVE%`iz+VW#LPr#RJS429 zy3aH{VzfakNW9(^N7IfrRX$EPW?0=XTP_an_!99~tGc95tud8mkj({nG|DqTIAcY1 zPmdf8Jf043^DMxaHs~m(hQ*m>mL=AiQy#YHIHg9jWWU0853&tdH%w)~q~0VHR;xA$ zt^&PYL0z+4uI{4Q5gw*$i(?}-c)yu}gKLJWdBMn)L;lFo?Zko0=J)nm^6c5<36DyG zGyRih4sJ1IQVC(%5i}*!$aRDcsZH0xX(_Lo5b^=B=Poue zBFG!SW!G^;n_^G3$JQnz{5E_=Q%?4qxHxsnqh3=s+eS8PzIYHvQY-IvG3bK=Y*W$BN+!%b7)^<6x+jeLu57^bVSCM}TIoOKmJPg& zgiOX5(;FpOUd%LrJ~J2pDICT;#}M|mkOET>^+L#N3-!R{G3UpVFlP^_@IjQqE}Y^FckChPvV%MZX2*7wQx z(8@%;LqeAW+_b}2CKS?^KEDe5AY@;qdMyONVC-+%NbH60(~@jPf~GA^&fQT#{Dr@4 zdsKiuoPcks9|rX4fId9-tF*IkQq`loIyLPo8Q8TW1gi?WG|E!zF1vHuT@^Wr1dMu7 zZyGYPB~yl)UH^7OuAOMEY#D8OVXqG$&Rw+^1)#+pG`A;D7EE-{y$H#Ix3tEjV-H=7 zzB{Cgb}SWE-}X9UT;PGZlf`$3f%NSn`~_l)>tP39`-@>$T<5q{aC83pKURFBeX%Qn z?DR)8))NnU!NA75OcehT(fj$ljSHbVQJ2{pN@JOpJKkH-ysLN`~QkoNqe5 z{rEg5Io{rXzn;@~f4~e`_nUSX7ork7JvByQdx(xujMD9?ZmHa1>A?fiqBb$oqazu} zj*O%Ru$7+Ua7u?fln1n(vJ$eHsmvJ5jPQ&NyK4*t1(O8#OO3fZ;4#CH*`EL8)HhO| z{FL5hgG#GQcl*<=Iu5b9NFIIR-FA|cOk4!>=d1MA3(S&<%w~VrWL%_btYU|#by$J> zy7+r3FSO>rwbE0J^Egh~s1P&DI#+VRfIc&w`QJFLa3AA-wUFaEPF0^k)Twv09*P zC(B0??Bh`y52Q8ToVx|#Vs$Z8971)W@(>?FN<;0gG6b!HT4C85=?r>i*&2EWp|Fi+ zfEwokRTkE|4gmufV{x!yaLJ4lpQ)VkO7lAFmk|cb#sX=@;9BwO`O~s6>g8Uy+H=OC znTKa!k+^@BW@!G{v4qC%3#+Mt(?9xD!1K^7!m6K*k<##(49-K?q_fwPsjTx2W4#6eAnx_?@K;B~3 zO-w(Dggd8HK#gh?hJ4+?R6Wy3EYc(vZ(_T5n4^*0MRhZKOa!BvJiR}Dh7KdOAG0`c z@Qxi-s~`gD9M+|e(D~yt^ry#k-yW}#;uV7C$(mz2fq&M2u!7XbCUoj6+!Wq5m09sN zv_xAj?8EdC#5dTxs+ya`)qHl@zKlimGYoJHV^xejR%~^Z;e)T<9G5&;<_~UY&q0n7 z^jrVq@|h^FbWDtT9NX#?SLhjUZh^>NNb7s}4kfqriBgOH_U_wjci#|de2^~RP}%=wdzojT_}0QD zG4qZ{nMtN@Npx_6M|YoZMZQf&bWc*>V=jNenRx*geo4~P(H|II6+GN7UX{75BgAr$ zxN(*s4&z`vE%L-&<2PB5Ulc>)mG1+B!wqJ^EPU2Y+=qKj!l*zR;%|_Gp~pQ|C!|)! zNkgliuIqvFyF$Ufg}r-EJ9vr9OW7UjheuVFykeF@EJCNk#2jO+9EcX|sRL-fRW>_j z>gCJ^eEuhKv~Cx>YWqEp|Nhr`obCVOnfu>S{2QL2vW)s=$CODMk3eP<_yZY|LDK{{ z2tv?AvRpvJRhW`O^cCW$`7s8&gR-}9V_(o z4O#80LR;I4r<~{OZke$3gv0nP_uZb8ocCPkKJRPKhbd+Joo9l8b)!P~KQCnL?2gV& z_^|CG(b}&^Z2Y~U_UH$0K4Zb$AGiBmq3y`;(2nTvyOB4JH$T|HKijdxyW7X&y&czr z@#y0`98$#N@8*2{w&HKz6@z|m@$3x*^YMg)_k8d3BR!Vnr#}0m$2{&G^E?Nm$$MT3 z(E0BVDDix=vd!B))3Q(6J$It zidp@pY5VqPD)u_Z2d?;@ff@S_&*bb~&pYq1FL3y;(}8@DQ5KQpNRyN6h*EcJFJl^0 z3rJaX1vQe>4w~9hB`qle{yZDxjJbBMaq9bW&}I{&BI!RND)6o(Js?E_kb&ebi%iJQb%v4GYb{z`B7*%|7f&TCTMy$sK0Y*1v8Q^IW^{-!AZ6 z_-Y}ib%a)T^?zOM=2UaTV$=q6nAwdaqa(E>`$^-B1$Hn zm#i8-2pnP5?rc|8FA}54Q~>;GXw67uf}e#7#0)lu!hE`tIln`@_yMaF4W}MhL5hHt z5_aZpl29mIl&a6lsjaB3ZJifSXkI;;T(Z%v+p<12jdqGP%Jj322?C+XOK{pqe-&nG z7050>=FhrKPc{6yeEWMhbdjSc5aRA>)}45gC2u8de5Sf|zN&d6E~vS2Xwb4okpb-r zB?mZrl3HCnl$ud0xIOg?^Vh)uH`LCEK4=>J@)*?Ed+zFcHn_j~Equ2)dQ#ByojhoM zzbDi;3c>p}FzBxVwx=?;a~}9#RR^4OMHH|N)WAFK(vnu&#JbI(MWul!lSX0dOiA#j z^fl{jcMC<~0W}+Cgt5OoFA4+VDH$OFR0^yfo!%mOL^_25=fS2{M2RdxnclP+a~mqe zD>b0ni;-z49n@P;bfcurnAAuWF4opGSc^zuIcRwMsv+^Tf(AOlwdAgwXtvFyVk4nC zVtNjoRSI!UEJw{XGy+!SsSEt+r&Zj>Hvk8ug8S?P9mvBq}2oI@KDSDx&eQ zhG@)?X%t30HHwZDZ}Y-=grhU(J3w2uI{MtIsvts%QSg^r`Iv!$9<8MurjO$zQ%7Gn z0Rxq_RmCfTkBhAqcnp0tpXLZw?L}33A}ty3)U_3BLF?VzlEPm}NvOnz)_s$$f--R_ z6JFxpY)hHSBp=-JYmA786Ga z6kxs>l$X-dsu#Q*M)Et{1kg5o-Nx*XTrZG^W?vfvliAP#DS1egRn4&`y;4k7(&Er1 zl6+Po($t@|>E_AvT&jCy81EqFy=zkAOZUiBmV7ywZ=CqQ{isP&itu26=w$S#!v6u* z*_*T7l=$R9nZrjFHp@RJ^vV-*J~7~JLF`P4-WTJG_3Jo?&`}Kx8gfvN92y6Z^;Kqh ziSKiQ)%AbgvZ^Mg^u1v~Jt(@;-{%jjc`1U(1PTl=#{62g$`cTtVMKwv91%K?K{*w4 zG*E#D_EywYePECpeP^zEW%g~zH>(|_p#aA&HJUGElMXB zj?c`1L>ME+Dy0~#6~Y+5k(v?emUKC2*^X6aOl%1v=}($wjNFkwMt7j&gTvsBgA_=1 z9v|`&p>of&b~%9NkShe5f{L3XB|jhl3<^Gjz=YSv+1#%q+)!F#IuM$tVw+M~R4ssd zcyl5LFZH|`hnktl4~<6?1~1(N6PE;*Eu*<#B-pu7a`XTZo}JhRVftYoJb;D)w zv-z@?Bs+Fb$)gAcpF10JK!PQk<}R^! zp@O36nlJ^F40qr#SarDoPiFmu0hguhsNW}j9s35VMUi0g*+}UI#yV`Y3vNH9UuA`n z_Rd@LSJ3X&FIn<&g11gcJ@x%#Lh&{wmsUba+qy+>o3dw#vW`_du5E#L z4A$IZ1@Aatu~P+~oSm_;2@%LSvvy13Nr*ESA!jZ( z1X-?A2zRsB*6k;7OgI>=|IAStqOJ@8`_Chb73(t7#S1mOydiILte&A*ELH z#XY`lRh{;y(H!@zzC`#8wp$@WTQcH@Xhy5Hn)7+a#2LiNG|!#o>Ec+aFC;FFizWs9 zah5R*pu$Am5wD`NR*}a`%u`Q934%_*^_g(}*L(RZjKJqYE`at*ThL=-#1-+0UW z5rf=P<2%6l>t_ENa1%Y@^vR=)ffYmFiz{{?J zyOvA^;jfAVIZv`qu0f#IG{&;T@W_nge__NIg2Wp_;mrIaVtqz%wrS1>|> zba#8oBoCI@r>aTWuABvMM5HeJLqI(C z2m!MWKR&2{{9=Ff$p!2Z^xMPzyfwdc_K)29)FkJ(pq{=%7(jvZ{z4n@$~Nc;uJB-o zUZBBVpn}f|6E#(Q zOr(`m2iJ#b;M77l7BoKFY4E|u(icMZVvb~KUDeF`yS0T~c{%YJ+If;|zoc_bT-3pE z1sHG%IywP*_=KYP{Lnu5s>aKV?%V*V@uI9vdHX{$Q{eW{N;A2Pm)(MChn=vw1H;~H zkd!I?o1RNk$AMt%U^rQ;TS}`NLq7>^70L0X+_SQhy25Q56mxpA7jLt8jO{Fupkr)n zf<1br3O6=CRoI@<7Gu=-6GK18y4wn4l-_-(le9w-65j42s^>BE0o9U`W>zWFK?^WODg|7&SX%D%S2_Y+ICA_zt|`~p|u5EgDk?=pGP^cbc@ z?ahqG!iiUVRob;bR;f`(>J3;r-e{c{!TlsceQr>nJ^e2jADCRV=iXlf4Y?+G!@_ZW zowxrOn+bo)mNtHK814!FP5hDl@1`OR1tCK_>wi~&HkGi&5qN_GP%l7H0wE2IjIoU* zDQMESa3YYWXPig`5%!H_a#Asde=XN`cMVPm^O3;6La2{~6jN33aH_tRsFW-;AraJq zO~P|8E;^UKKg!78d_3&l_yc1EZic}5R1<~B7e7`+y}!teV2sx7JM$>qf%d`}35^KL zP-P@7E>fvXOIWJ0#Ro}Hc+ia0kgyu~T9@%C_4rB6HQY1H!RV)AQe`des(GKPuSOSk(9lf*zvd%$Ce972WF){}G& zEAU&|JA|zi*L!s8Ogov+k7pG_l3(Q*(qYCW04f{xoJ`yGSX1_Y!?`C7{%Ie<1*0`o zXoYC9gA|3JoG)=ia(^S!FL;1ui=Z z!S@P~VRBimtxTvqn6M7E4>R0DD#gtDHXBnH$0)h3cA`zDkw^JRwg;ggr|A=!n7f0g1^62Z4o z_+^5^SdG$gbMg@vx3w0LbGO@GVqkU7m+XTvVR6lu7$^?0Ybe!M|0De5S!fI?gI-|u zjxcv3r;b4NE*cO_Igp#9|M8heAR|p1k{xoM)cM<+LYkrnWIb*u{Bx`{jHi_a!iL$U z_D|P^wW{1j&!^o@nl1XvD1oqq(xU9pdzEUsk9qi1gZ3BoRU}~$*aSC25Y7~;_8pJ zM48G{is09WM#ITMOi8@iriRnxjbKc}mpiGFzrZI>14Guu5ah?mFz&=Bbp&&3gwKW( zpCj5Qbh$cVqvg|Ad7nj;-p#|!4~J}Zo zu2Nt)Xk)o%59Iv~3~e{Yk}5jo)WX(AE?Dgrt0+Li+!e*)$*9HzC`h1LVu6eM0`aVN zi{^<4ftT9G!1Mw~{6uwQdV~nj%8p6TE*z3K7|ttlMUctnf+(8}vDzdS_c!gu>92u% zm&Ezb$KCjM%JjTEV#RiU#(xI&Fl+Q?gxa<3My}!XU zA>$Xa8`>Ive8k%vqK*9}V8N=8>0$2wjXUSVnZ6|Kj&4o&3rM<`rC1_6U4F)>kw6+j zIgkJV_1v-5?=9Yt+E9O%ToWFE55fcQM-Yh_!X#|{c%r9`OkR_zgg?bToMRLjWats2 zHvEz?l)^r<%BW)$Hf+U*b`tr`gjo=C@>j0_ z*rYRpgdr{NQQ|yXvz^fDyEee+#6Vji@o#sGulIL9e(%Ri-$C+J?l=4Z z_UJ}AxtmbpAq<}dNWQXE?N|Iz+Y7=+XZ4YS;(9Qrx&3g z{VoT8cIrL-WxHh zAIx6YOBB98ss7hSeBT|w{%DT*{?q&ZOxy1xx7%MI?CvN3m)<#_@?fGr#9sKz*bl!D z|9e1w$zc4^k$!P_{`geiXeL~$m{?JyDm*xEZDb1c?@3pF;BlL0R_KHS@ry~Yj5ek+3slnOU9 zW57O`GMeZ^Z6z~;Tv?3AbvUAg@-REDq=J@~torU&!pn&%3yM2{)q#DQPG-m>0#_CUUH}vNz~TINGzG ze+Z^4nHZ*xs6C4vo`igC#tNY^iP=d;1V#gK7;5Ux^)E9n2_8c1s(`fT0G07-_R7uH^RIimYw?Ho)sL-~yfCzzFt}VLP3(Oy>QuZ%fkR@wtX={Uq38@QO z{0VJvpPyK%+1S<)G#$v~@bHy3{6$i9c z2|&OjqUAK=vJS-Ce%#@A5%U2f5XK$WRAZ3E}D}W}9a_L5M zhqCFt*O?0y_W)hl(#!4!xUCN0F1JjaM~WCN;Mneua<%<_6OYSGOreVkl}FBk`$?R2 zdx3#WngwxMsB)^a(^9mwDw0VzDH=+qcKXt&A-Qp`Q{Qx6s8mg~Y-(TE*)9gsadTEL zFpUkRKcA&h6U|x}m0dh!v0Mbnj9DkGnoSO=2AzmxeO8m+v_BVuh|g97;y#+^!Nkjk z7ArF2ao!4~t3$qWX4F%@;E1K%xkm8q$G7s%FIRXMYh%e=8X;@Qtf<)k8JY4Bdboxv zi*%~!tb)#J1kKB-Xe#2O7>%fFGotcDp8e^nNG_CBzA74Qu_TgAmjy~)@ZcTZMEDqg zMnt3K+8_(!I*dWFFLf?KSOegYJ8j3_GLU*(+Y+TQj@j85b_=wf%5#-Y|7A>)ndGbP zUdpZ0v?hg8PWcO9Xsj~VN?Xq~HShOM_UzAmR1LRIF=GsB-tOD0C*}tFCx_xark#;4 z+)5}qIf`1uc)p5griy?=X?~PCWJuE_6Oe>jeGSN&$_ZMX~gYeCeLHCMV+}WeIGMH-%Y-nP5m_#tKP4~bvfZb zN;vF0;kb@{TxE&}>v^sa&4e$dUS91Tgt(^55o|xfgOinM*75jSw;_wm+Y=7&#++mN z==os7loP0+zN%VvQfIcVV#LD5R`ljeAKhF zId%D+pEFR}UjLM^mF{vHHu^npVQrZ7J4GEX=z&W#Z-?wH=Im*DVFvGTBG#GAG@;F& z(cB5mH;g|lSGSZHO_^bCqU9mSMI((7kaseflT?XH@ya1g_xk$HPD9I{i_QLlVq9~n z_NqeZtpxFS*8#!zwbs8eYomX~?X9_EP2mg??#cVT#HT#lKi$O26LJ(TxskMhJ&;71 zh*sC*fsOU)`SDjY1%fBGU*V^yG&a4^^RInKkNh#j-W13+;MCq|3VI>^MQ0DwMNt)q zoPpY~(piJhX7VHRh9tFFVHGtr{$N#MJS%--hUmS$gti5C51=Y@$16b0L~v2}PK1+Q z+dwoK$XpCm^Bz`+VknzUzuV<7-Q|GYu@|piEH;BwEXal<|I-1RmD-{l|C3?FDp4k7 zm?O6VzhnqVi$K)@X(ftfyYP@T2Z2e~RY1sRH}uYw$;YhV10QhRNlw(9xj&1IeJAnh zn@5XoLE(b0QhsiWb=`W)NyQ_tnY!8UNsTnrcxzFDLLo~h)#&aMCl>N1mgtmYifJ8L z`PyR_y&1-st}Jj*utaAQ;UlavBiAzeUs20MI6iqJTAIyUG7GKC%WTKkD96|gf#tXp zjG$w1lM=B3&FY@pG%H6Noz&EW0Z|T4h|m`g8ZR~7Xlo{2XoV?hoV6)vSmq6azxRx8 zI;xq}ouGj2g&=pPf%6YiJfpJ=R8%NyMYi-JNN=5q5tRk#*T+YqpgsJZPLg)*5k7>-HKnJQM1eM}zv7F$HPs3>Y}hJu_%I@vq)D zt>%^Avua$*DO4yP!J?I!HKDerSi6UlX`81A6Ac( zCtX4MmX4TYn9XW8HxPl}ERr;2=z);Na?knHVjw~ChnZr2>fc=Ghg~Usf_(7tXH*X~ zL7z02cTTxp`rB{SH&*Ct563ADQaIs7%d~M>1?m4fVbyUqVf0@*geklTJA&N@wHpxt$mo( zKQsE1^zzuJL(`)%Ew1Fgc`2lEX(6+oIW1+rh{D+adV$b%%NsNMvgF}dRI<&1;>%y6 zt>(u9svn3*fUPm5l_=-AD5%zm)Fo0X2SE@AjT!(?G4y@dH9Fy%)>DE#cyFQDyN+mE z*@~^_H0in_9bG6qWD|TI@}oQe~TLx4i_pM zl%(3>*S#+$k{JRVWPT>`K53?vowrtBLPc9w5YCq1K(0B0j>IJNvYX<}86W9z*SarT z*GD>d3ocL841)BF9nO>k?1H8B>cwr%R^xQ1P((mtD%g!KqZ0iWwnbvcR zo1;F=N!)UVB(&4MD1YpNs=-39X`-jrlHYsN+!7$_X%Oh&Ks8`f5Y_{4`v~}hP_GT4 zK@W66ZqSBQ9}IHI5H^B1Jgk6bV2=8~b)ynMiUw{&oVpXVTNI>YYI{8~Ob^H#$;;W% z?Ix>ofA0G2znkVsJtkL$*PBe-s7>dp=sPlBEu6G15e@Oc(ga6VLY1!6W}g@y^sXDM zYv+EQEW5IkW1P&9)}r~Ef}4Nt?~}vR<0fp^;5lo2ml}VpA)_;Yz^xNad2p$5Nj}&} zr6p|qN%M3BmN|KTz-p?bOvcJC@k)|8X#9M2GilvT+{VDHZuoI68gnzt`W05i;K${E zCe%^h-B7E?%c@Q8Qk#qpbT`D4@t*+3ncEzi)Y>{*witzK8X{U7&D_Y@aB%!O z7B*E;F)vpwz2326=78NyhIvh6x@UUgW@<;ol}%KdatpPK79jl~KP6GZL`!-CR2_FP z@Y4Pa(^0xYxb&Aj z-mu8pcL#phf~T1`&*U|f)yW5&QWm;|dP4h-vdkd)Yooy4JXENV{cc=m8p$kjIf3YB z_xTgF#vjxQb0bQR5X?%TJO=TM>=(S;SIJ(60U|Uq#iVf3>0n==f5Zrq(DepkpdUX> zzpo?zf8Q)({qKLY|B)g}G_1X`#Zmp#lUh2f=@pZk<03ESSQ3xO1{IW~gl=w4^ExFlf=CuFMMX#oVSKQ@1KfvLdxLbV`&T0~LV^X*{*qNuRh# zHJMLXWvlceoWQvad>nLAZQ+H?n6!vWtu8-Wi0ajotDR_ROjWt>ELCU20XJi^t)pjp z59Y2w(zy+(tXPo*dIwys$L6CWWGq7;Ix!SkP5RU{7Gg->LlGlRoqBfo=&`A^x`hB) ztCq}>dy`7U3`hU*`Ex?UsXsZX3OBj600`dX?#3zd?HXI*8b!_9}&+?Gg zO-wXaqb74sDYOs?!c|Wm$5f{}wOFaL(*Oyl!*JSHbdsejTPe24z_E&-wHITfX0kjD zE7KMPIf>R;784XxJo?NqpwRXWbSu}wbjaXz58`MpPcos3hH%K7Jha~Bc`&m@lPJ+n zVMiH)BU>Nw3pM;6Cz+zQHHb*h_kmp7G-4m=hN-Svu^LENMekq-TBK#YadG>dnX5Wo zS(^!kctKC0x~)>fWkzC8(O6R749&4QCrA1!evFt?V(lCy@0mDx&wKss%H2sDiDF6r$&^Z(W7LYrX^>lvS{Sa zU53WGUWs{lqmVopc^n~^G|%f+c-7s7>ek*Bqs$tz>RO~zFI_85P1V3>M@q1h3QFIl zlU~`At3*<^8q@70Wom1l-j2Ka> zAw_Gkf`RK0d3XcBPdViDo?-nvk>aMWFbegSQL1gss*Gvu-e26qOp_S>QXSIt9s4v2 z4jKa?@t)qw1!U?m(yk2PLVGc6_ULvuEIy!?R;4S)u)4uM&n@4dZW>XQ=*kLtQI7u> zo1DzjF)0Lh%erwmp+H>w#8o+^RF%~};4?Q|%?v1_#a_ep6X3zQd2KL_jJzM#K-*W= z#wuCMvKR2p@4mF|lm4LYEVWsyA)!#OiV_pVwZxRjJ|~AKlx`D!GIsy15`+0vi+3K7 zykMOo3XEZuqL={s<)}xuilT?OG%(ECs@1;qxY8x?X=WRmu9+6P+`!G{R=v!-@TtqA z@mFJ`9EsiXL}@xVJ6HC^2^jCHfcCn-SO5)Bv80>bHqMnA>tW?Z=X`CG1t&>|vL$@Z zBnra7(O2){NY|AiX}2fgVIEr?&cXHn=W{HTZxy)DAwh@EIE6tNTX2nM`b z>j;Kl=7>TR3qCOw3;|#`d8RbV7yxM;zQMSYB$PTq<%q2`jqaKZPPr!@O(DZ}X@j>F?$ zeM2S72S3ROAGIr3u=|R`Hpf?xXuFZD zk)N%BFSpOUwQ0$IsF}nRy}x;?zcbj+24-(yf!t-ph{fh8PyC1pUtyTOlmpFi7DBus z5qk`c=RD6^hCYjoY>sO&J*t$Q!K5NFP1w}mpW95ASD8*9 zGG3n#1To3>!$!|RL*|3}4uA4g#<9BGMTprVF|y9FlZXrF;Xj-QFDMRhC%EdGjmB@m z(x}~JEWOe+=kmD!@ToPv{nO1iPyGn3E6l%6{Wzs7tnX4~SZOQnJraD}^Xbac1<%k-?-uCR zVav^ffnJJ?P;=&o2U}*fGE!i0ll2(%>oS>8IaAfCUMUdE^~{8q$@EWih`ST z8J!xD?>?y{eG85~Yji=^pS}@*Zw2CiL)V|WBJSSKNR98}>B5)NVH)Zu*kC>a{`9vT za=|ll2cWGy^gmp^XH*6GWAGn8pwa%Vk@zn+xT41Pb{Y!*zQO%}LHcWS^k6jf|B1?v z1Gi8qHPC`!WrIu-(TY}QJ3ykdb+va5+?Bly{53GA`M!Jj`Hj*eHOHCVwh6c=GyF*K zzRB~xcFucnlE2pf`|-vd0BO_q&!PHez|W4(ngd~<;sawDy&>`pB}ef5QHGiW<}FnR zdAr^8AsLt^C?+RPa`qEd9s#wHlZ=@Cf}orrp5Q_0xGR-jh~svE84#(G{}<##`_6Y^+f7}~G2Td*+;NAb16d^3az>L0rM5>}yvTmTz~u(+Ih z&jKwTgTKdQ`;3RCP8 z77sEe(TeQ`^k8JnE-_Po!-*f^8$-#cYixB@;* zOE?3JFzf&`3ud3D=45vFA%Z`&sorc#c`nNpNl*7z~aVT zwGKM_%Dkk%74=|PCA25#Q5vV9rBepH0?b0y0R?~6Lxg6E5Mo)J0t8ueDzy)sg|sfb zSQCpjkMkSQNk-~zdeG~KzLE}+*=If)%TtKbDQL8OqkS<_& zNtM~BTF;z&T2bY&dIy=R8C6FsZt<=}lbC)2U^fd{GD?u1%R^%nktuab z+>4z~LNb$bIv-UHENGqk$jmS#O6fYSdQPt9RmoE{uTymzsO@2O$Dn`3QBHD^9A>Ah zluQYSL79cBZJX?utH69)^gYj0?<*$Cg}yoZi%Gl;ncSK>$`xf}O^gEyy-MW#^qA-+ z6?SeyXafSAYBE&e6NhKNYI6}=nuK<} z@%-PAk)BGOiGcPwJwq4LZwx)M^L}0t(6G!)2Wp|rty5;B`HD*Hg!^Ib{;D%wh?v{T z#q$G7`@)p9d;(5XTZtAl`Ai zrJI^>iM4>C#oow8;1E8M;lrQjbMRk5X<^gkG7*X17TX*+r+qR9> zwr$(Cjn%f@z1p^I+qP{RxA)#Bxxen0yH8T7N-C+JHS^9npD_joKdR&ih!9f2vL6Pt z0eOxUwgSryt_|WYapm9MuOcD}jixwq>27@)w(EHVWRH^>I3q~|WPy;c9&C1G-rcFd z4P$5BHq4ttj$44w>=HL2>Xgt-Kd#SgY>*DSkuJWA;pqD5?7=RGeSS(Za#(yV3+RWZ zcEBgPfAu<_)G&eMKZ{q%e?;&9%f;(|O4NV4ol12GH>^d3FVzrLl_i%7zR*$#$b(p8 zBoczaesj!WmYuzFd043&eVWRPsKX@n%8b+>^#p2qL+*@&ARHu!#9AO)tK>F`V|x)Lt3JHoatS z58?>fce^$S*+~>Yn`3{%~Jkl7vKa8jBNR0ZZjd3L5K?^jdKl6R{El;xqzl5vkK( zabFWNu@*uVqhi&s{h^Snq&ZcLq@o9a(kzMKnx6L6pMr!a<;v2`OWekNcxRM zdkyx|#bp$mX}dnc+xX99(w>S8?5*NU%0A6x+(S7MI@znG6e31y(y))kO=Lv*4y5Kn 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 z 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 z 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 diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java index 6748ad1dc..2bc70c30c 100644 --- a/main/src/main/java/net/citizensnpcs/EventListen.java +++ b/main/src/main/java/net/citizensnpcs/EventListen.java @@ -96,7 +96,6 @@ import net.citizensnpcs.trait.CommandTrait; import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.CurrentLocation; import net.citizensnpcs.trait.ShopTrait; -import net.citizensnpcs.trait.SitTrait; import net.citizensnpcs.util.ChunkCoord; import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.NMS; @@ -237,7 +236,7 @@ public class EventListen implements Listener { npc = CitizensAPI.getNPCRegistry().getNPC(((EntityDamageByEntityEvent) event).getDamager()); if (npc == null) return; - event.setCancelled(!npc.data().get(NPC.DAMAGE_OTHERS_METADATA, true)); + event.setCancelled(!npc.data().get(NPC.Metadata.DAMAGE_OTHERS, true)); NPCDamageEntityEvent damageEvent = new NPCDamageEntityEvent(npc, (EntityDamageByEntityEvent) event); Bukkit.getPluginManager().callEvent(damageEvent); } @@ -278,7 +277,7 @@ public class EventListen implements Listener { return; } - if (!npc.data().get(NPC.DROPS_ITEMS_METADATA, false)) { + if (!npc.data().get(NPC.Metadata.DROPS_ITEMS, false)) { event.getDrops().clear(); } @@ -286,7 +285,7 @@ public class EventListen implements Listener { Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event)); npc.despawn(DespawnReason.DEATH); - int delay = npc.data().get(NPC.RESPAWN_DELAY_METADATA, -1); + int delay = npc.data().get(NPC.Metadata.RESPAWN_DELAY, -1); if (delay < 0) return; int deathAnimationTicks = event.getEntity() instanceof LivingEntity ? 20 : 2; @@ -323,7 +322,7 @@ public class EventListen implements Listener { NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getTarget()); if (npc == null) return; - event.setCancelled(!npc.data().get(NPC.TARGETABLE_METADATA, !npc.isProtected())); + event.setCancelled(!npc.data().get(NPC.Metadata.TARGETABLE, !npc.isProtected())); Bukkit.getPluginManager().callEvent(new EntityTargetNPCEvent(event, npc)); } @@ -453,7 +452,7 @@ public class EventListen implements Listener { return; } boolean leashProtected = npc.isProtected(); - if (npc.data().get(NPC.LEASH_PROTECTED_METADATA, leashProtected)) { + if (npc.data().get(NPC.Metadata.LEASH_PROTECTED, leashProtected)) { event.setCancelled(true); } } @@ -486,11 +485,6 @@ public class EventListen implements Listener { @EventHandler(ignoreCancelled = true) public void onPlayerTeleport(final PlayerTeleportEvent event) { NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getPlayer()); - if (event.getCause() == TeleportCause.PLUGIN && npc != null) { - if (npc.hasTrait(SitTrait.class)) { - npc.getOrAddTrait(SitTrait.class).setSitting(event.getTo()); - } - } if (event.getCause() == TeleportCause.PLUGIN && !event.getPlayer().hasMetadata("citizens-force-teleporting") && npc != null && Setting.PLAYER_TELEPORT_DELAY.asInt() > 0) { event.setCancelled(true); diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java index 0d03e12eb..145f04573 100644 --- a/main/src/main/java/net/citizensnpcs/Settings.java +++ b/main/src/main/java/net/citizensnpcs/Settings.java @@ -166,8 +166,6 @@ public class Settings { STORAGE_TYPE("storage.type", "yaml"), SUBPLUGIN_FOLDER("subplugins.folder", "plugins"), TABLIST_REMOVE_PACKET_DELAY("npc.tablist.remove-packet-delay", 1), - TALK_CLOSE_MAXIMUM_COOLDOWN("npc.text.max-talk-cooldown", 5), - TALK_CLOSE_MINIMUM_COOLDOWN("npc.text.min-talk-cooldown", 10), TALK_CLOSE_TO_NPCS("npc.chat.options.talk-to-npcs", true), TALK_ITEM("npc.text.talk-item", "*"), USE_BOAT_CONTROLS("npc.controllable.use-boat-controls", true), diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java index 7b4ce212c..b2cc1b0d2 100644 --- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java @@ -78,6 +78,7 @@ import net.citizensnpcs.api.npc.BlockBreaker; import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration; import net.citizensnpcs.api.npc.MemoryNPCDataStore; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.npc.NPCRegistry; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.trait.Inventory; @@ -394,11 +395,11 @@ public class NPCCommands { permission = "citizens.npc.chunkload") @Requirements(selected = true, ownership = true) public void chunkload(CommandContext args, CommandSender sender, NPC npc) { - boolean enabled = !npc.data().get(NPC.KEEP_CHUNK_LOADED_METADATA, Setting.KEEP_CHUNKS_LOADED.asBoolean()); + boolean enabled = !npc.data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean()); if (args.hasFlag('t')) { - npc.data().set(NPC.KEEP_CHUNK_LOADED_METADATA, enabled); + npc.data().set(NPC.Metadata.KEEP_CHUNK_LOADED, enabled); } else { - npc.data().setPersistent(NPC.KEEP_CHUNK_LOADED_METADATA, enabled); + npc.data().setPersistent(NPC.Metadata.KEEP_CHUNK_LOADED, enabled); } Messaging.sendTr(sender, enabled ? Messages.CHUNKLOAD_SET : Messages.CHUNKLOAD_UNSET, npc.getName()); } @@ -689,7 +690,7 @@ public class NPCCommands { } if (args.hasFlag('s')) { - npc.data().set(NPC.SILENT_METADATA, true); + npc.data().set(NPC.Metadata.SILENT, true); } if (nameplate != null) { @@ -1270,11 +1271,11 @@ public class NPCCommands { flags = "t", permission = "citizens.npc.leashable") public void leashable(CommandContext args, CommandSender sender, NPC npc) { - boolean vulnerable = !npc.data().get(NPC.LEASH_PROTECTED_METADATA, true); + boolean vulnerable = !npc.data().get(NPC.Metadata.LEASH_PROTECTED, true); if (args.hasFlag('t')) { - npc.data().set(NPC.LEASH_PROTECTED_METADATA, vulnerable); + npc.data().set(NPC.Metadata.LEASH_PROTECTED, vulnerable); } else { - npc.data().setPersistent(NPC.LEASH_PROTECTED_METADATA, vulnerable); + npc.data().setPersistent(NPC.Metadata.LEASH_PROTECTED, vulnerable); } String key = vulnerable ? Messages.LEASHABLE_STOPPED : Messages.LEASHABLE_SET; Messaging.sendTr(sender, key, npc.getName()); @@ -1527,15 +1528,15 @@ public class NPCCommands { Material material = Material.matchMaterial(item); if (material == null) throw new CommandException(); - npc.data().setPersistent(NPC.MINECART_ITEM_METADATA, material.name()); - npc.data().setPersistent(NPC.MINECART_ITEM_DATA_METADATA, data); + npc.data().setPersistent(NPC.Metadata.MINECART_ITEM, material.name()); + npc.data().setPersistent(NPC.Metadata.MINECART_ITEM_DATA, data); } if (args.hasValueFlag("offset")) { - npc.data().setPersistent(NPC.MINECART_OFFSET_METADATA, args.getFlagInteger("offset")); + npc.data().setPersistent(NPC.Metadata.MINECART_OFFSET, args.getFlagInteger("offset")); } - Messaging.sendTr(sender, Messages.MINECART_SET, npc.data().get(NPC.MINECART_ITEM_METADATA, ""), - npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0), npc.data().get(NPC.MINECART_OFFSET_METADATA, 0)); + Messaging.sendTr(sender, Messages.MINECART_SET, npc.data().get(NPC.Metadata.MINECART_ITEM, ""), + npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0), npc.data().get(NPC.Metadata.MINECART_OFFSET, 0)); } @Command( @@ -1611,9 +1612,9 @@ public class NPCCommands { public void moveto(CommandContext args, CommandSender sender, NPC npc) throws CommandException { if (!npc.isSpawned()) { npc.spawn(npc.getOrAddTrait(CurrentLocation.class).getLocation(), SpawnReason.COMMAND); - } - if (!npc.isSpawned()) { - throw new CommandException("NPC could not be spawned."); + if (!npc.isSpawned()) { + throw new CommandException("NPC could not be spawned."); + } } Location current = npc.getEntity().getLocation(); Location to; @@ -1671,7 +1672,7 @@ public class NPCCommands { old = old.equals("hover") ? "true" : "" + !Boolean.parseBoolean(old); } npc.data().setPersistent(NPC.Metadata.NAMEPLATE_VISIBLE, old); - npc.data().set(NPC.Metadata.FORCE_PACKET_UPDATE, true); + npc.scheduleUpdate(NPCUpdate.PACKET); Messaging.sendTr(sender, Messages.NAMEPLATE_VISIBILITY_SET, old); } @@ -1767,8 +1768,8 @@ public class NPCCommands { permission = "citizens.npc.passive") public void passive(CommandContext args, CommandSender sender, NPC npc, @Flag("set") Boolean set) throws CommandException { - boolean passive = set != null ? set : !npc.data().get(NPC.DAMAGE_OTHERS_METADATA, true); - npc.data().setPersistent(NPC.DAMAGE_OTHERS_METADATA, passive); + boolean passive = set != null ? set : !npc.data().get(NPC.Metadata.DAMAGE_OTHERS, true); + npc.data().setPersistent(NPC.Metadata.DAMAGE_OTHERS, passive); Messaging.sendTr(sender, passive ? Messages.PASSIVE_SET : Messages.PASSIVE_UNSET, npc.getName()); } @@ -1914,14 +1915,14 @@ public class NPCCommands { permission = "citizens.npc.playerlist") @Requirements(selected = true, ownership = true, types = EntityType.PLAYER) public void playerlist(CommandContext args, CommandSender sender, NPC npc) { - boolean remove = !npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, + boolean remove = !npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); if (args.hasFlag('a')) { remove = false; } else if (args.hasFlag('r')) { remove = true; } - npc.data().setPersistent(NPC.REMOVE_FROM_PLAYERLIST_METADATA, remove); + npc.data().setPersistent(NPC.Metadata.REMOVE_FROM_PLAYERLIST, remove); if (npc.isSpawned()) { npc.despawn(DespawnReason.PENDING_RESPAWN); npc.spawn(npc.getOrAddTrait(CurrentLocation.class).getLocation(), SpawnReason.RESPAWN); @@ -2184,10 +2185,10 @@ public class NPCCommands { public void respawn(CommandContext args, CommandSender sender, NPC npc) { if (args.argsLength() > 1) { int delay = args.getTicks(1); - npc.data().setPersistent(NPC.RESPAWN_DELAY_METADATA, delay); + npc.data().setPersistent(NPC.Metadata.RESPAWN_DELAY, delay); Messaging.sendTr(sender, Messages.RESPAWN_DELAY_SET, delay); } else { - Messaging.sendTr(sender, Messages.RESPAWN_DELAY_DESCRIBE, npc.data().get(NPC.RESPAWN_DELAY_METADATA, -1)); + Messaging.sendTr(sender, Messages.RESPAWN_DELAY_DESCRIBE, npc.data().get(NPC.Metadata.RESPAWN_DELAY, -1)); } } @@ -2391,21 +2392,17 @@ public class NPCCommands { if (args.argsLength() == 3) { shop = shops.getShop(args.getString(2).toLowerCase()); } - if (action.equalsIgnoreCase("delete")) { - if (args.argsLength() != 3 || shop == null) - throw new CommandUsageException(); - if (!sender.hasPermission("citizens.admin") && (!sender.hasPermission("citizens.npc.shop.edit") - || !sender.hasPermission("citizens.npc.shop.edit." + shop.getName()))) - throw new NoPermissionsException(); - shops.deleteShop(shop); - return; - } - if (shop == null) throw new CommandUsageException(); - if (action.equalsIgnoreCase("edit")) { - if (!sender.hasPermission("citizens.admin") && (!sender.hasPermission("citizens.npc.shop.edit") - || !sender.hasPermission("citizens.npc.shop.edit." + shop.getName()))) + + if (action.equalsIgnoreCase("delete")) { + if (args.argsLength() != 3) + throw new CommandUsageException(); + if (!shop.canEdit(npc, sender)) + throw new NoPermissionsException(); + shops.deleteShop(shop); + } else if (action.equalsIgnoreCase("edit")) { + if (!shop.canEdit(npc, sender)) throw new NoPermissionsException(); shop.displayEditor(npc == null ? null : npc.getOrAddTrait(ShopTrait.class), sender); } else if (action.equalsIgnoreCase("show")) { @@ -2580,9 +2577,9 @@ public class NPCCommands { @Requirements(selected = true, ownership = true, livingEntity = true) public void sound(CommandContext args, CommandSender sender, NPC npc, @Flag("death") String death, @Flag("ambient") String ambient, @Flag("hurt") String hurt) throws CommandException { - String ambientSound = npc.data().get(NPC.AMBIENT_SOUND_METADATA); - String deathSound = npc.data().get(NPC.DEATH_SOUND_METADATA); - String hurtSound = npc.data().get(NPC.HURT_SOUND_METADATA); + String ambientSound = npc.data().get(NPC.Metadata.AMBIENT_SOUND); + String deathSound = npc.data().get(NPC.Metadata.DEATH_SOUND); + String hurtSound = npc.data().get(NPC.Metadata.HURT_SOUND); if (args.getValueFlags().size() == 0 && args.getFlags().size() == 0) { Messaging.sendTr(sender, Messages.SOUND_INFO, npc.getName(), ambientSound, hurtSound, deathSound); return; @@ -2590,14 +2587,14 @@ public class NPCCommands { if (args.hasFlag('n')) { ambientSound = deathSound = hurtSound = ""; - npc.data().setPersistent(NPC.SILENT_METADATA, true); + npc.data().setPersistent(NPC.Metadata.SILENT, true); } if (args.hasFlag('s')) { - npc.data().setPersistent(NPC.SILENT_METADATA, !npc.data().get(NPC.SILENT_METADATA, false)); + npc.data().setPersistent(NPC.Metadata.SILENT, !npc.data().get(NPC.Metadata.SILENT, false)); } if (args.hasFlag('d')) { ambientSound = deathSound = hurtSound = null; - npc.data().setPersistent(NPC.SILENT_METADATA, false); + npc.data().setPersistent(NPC.Metadata.SILENT, false); } else { if (death != null) { deathSound = death.equals("d") ? null : NMS.getSound(death); @@ -2610,19 +2607,19 @@ public class NPCCommands { } } if (deathSound == null) { - npc.data().remove(NPC.DEATH_SOUND_METADATA); + npc.data().remove(NPC.Metadata.DEATH_SOUND); } else { - npc.data().setPersistent(NPC.DEATH_SOUND_METADATA, deathSound); + npc.data().setPersistent(NPC.Metadata.DEATH_SOUND, deathSound); } if (hurtSound == null) { - npc.data().remove(NPC.HURT_SOUND_METADATA); + npc.data().remove(NPC.Metadata.HURT_SOUND); } else { - npc.data().setPersistent(NPC.HURT_SOUND_METADATA, hurtSound); + npc.data().setPersistent(NPC.Metadata.HURT_SOUND, hurtSound); } if (ambientSound == null) { - npc.data().remove(NPC.AMBIENT_SOUND_METADATA); + npc.data().remove(NPC.Metadata.AMBIENT_SOUND); } else { - npc.data().setPersistent(NPC.AMBIENT_SOUND_METADATA, ambientSound); + npc.data().setPersistent(NPC.Metadata.AMBIENT_SOUND, ambientSound); } if (ambientSound != null && ambientSound.isEmpty()) { @@ -2637,7 +2634,7 @@ public class NPCCommands { if ((!Strings.isNullOrEmpty(ambientSound) && !ambientSound.equals("none")) || (!Strings.isNullOrEmpty(deathSound) && !deathSound.equals("none")) || (!Strings.isNullOrEmpty(hurtSound) && !hurtSound.equals("none"))) { - npc.data().setPersistent(NPC.SILENT_METADATA, false); + npc.data().setPersistent(NPC.Metadata.SILENT, false); } Messaging.sendTr(sender, Messages.SOUND_SET, npc.getName(), ambientSound, hurtSound, deathSound); } @@ -2717,7 +2714,7 @@ public class NPCCommands { } else { Player player = Bukkit.getPlayerExact(target); if (player != null) { - context.addRecipient((Entity) player); + context.addRecipient(player); } } } @@ -2802,11 +2799,11 @@ public class NPCCommands { flags = "t", permission = "citizens.npc.targetable") public void targetable(CommandContext args, CommandSender sender, NPC npc) { - boolean targetable = !npc.data().get(NPC.TARGETABLE_METADATA, npc.isProtected()); + boolean targetable = !npc.data().get(NPC.Metadata.TARGETABLE, npc.isProtected()); if (args.hasFlag('t')) { - npc.data().set(NPC.TARGETABLE_METADATA, targetable); + npc.data().set(NPC.Metadata.TARGETABLE, targetable); } else { - npc.data().setPersistent(NPC.TARGETABLE_METADATA, targetable); + npc.data().setPersistent(NPC.Metadata.TARGETABLE, targetable); } Messaging.sendTr(sender, targetable ? Messages.TARGETABLE_SET : Messages.TARGETABLE_UNSET, npc.getName()); } @@ -3021,9 +3018,9 @@ public class NPCCommands { public void vulnerable(CommandContext args, CommandSender sender, NPC npc) { boolean vulnerable = !npc.isProtected(); if (args.hasFlag('t')) { - npc.data().set(NPC.DEFAULT_PROTECTED_METADATA, vulnerable); + npc.data().set(NPC.Metadata.DEFAULT_PROTECTED, vulnerable); } else { - npc.data().setPersistent(NPC.DEFAULT_PROTECTED_METADATA, vulnerable); + npc.data().setPersistent(NPC.Metadata.DEFAULT_PROTECTED, vulnerable); } String key = vulnerable ? Messages.VULNERABLE_STOPPED : Messages.VULNERABLE_SET; Messaging.sendTr(sender, key, npc.getName()); diff --git a/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java b/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java index 5b99603d6..fb29e591f 100644 --- a/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java +++ b/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java @@ -64,9 +64,9 @@ public class WaypointCommands { max = 1, permission = "citizens.waypoints.disableteleport") public void disableTeleporting(CommandContext args, CommandSender sender, NPC npc) throws CommandException { - npc.data().setPersistent(NPC.DISABLE_DEFAULT_STUCK_ACTION_METADATA, - !npc.data().get(NPC.DISABLE_DEFAULT_STUCK_ACTION_METADATA, false)); - if (npc.data().get(NPC.DISABLE_DEFAULT_STUCK_ACTION_METADATA, false)) { + npc.data().setPersistent(NPC.Metadata.DISABLE_DEFAULT_STUCK_ACTION, + !npc.data().get(NPC.Metadata.DISABLE_DEFAULT_STUCK_ACTION, false)); + if (npc.data().get(NPC.Metadata.DISABLE_DEFAULT_STUCK_ACTION, false)) { npc.getNavigator().getDefaultParameters().stuckAction(null); Messaging.sendTr(sender, Messages.WAYPOINT_TELEPORTING_DISABLED, npc.getName()); } else { @@ -103,8 +103,8 @@ public class WaypointCommands { max = 1, permission = "citizens.waypoints.opendoors") public void openDoors(CommandContext args, CommandSender sender, NPC npc) throws CommandException { - boolean opensDoors = !npc.data().get(NPC.PATHFINDER_OPEN_DOORS_METADATA, false); - npc.data().setPersistent(NPC.PATHFINDER_OPEN_DOORS_METADATA, opensDoors); + boolean opensDoors = !npc.data().get(NPC.Metadata.PATHFINDER_OPEN_DOORS, false); + npc.data().setPersistent(NPC.Metadata.PATHFINDER_OPEN_DOORS, opensDoors); Messaging.sendTr(sender, opensDoors ? Messages.PATHFINDER_OPEN_DOORS_ENABLED : Messages.PATHFINDER_OPEN_DOORS_DISABLED, npc.getName()); diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index 018ff72f3..896efc52d 100644 --- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -48,6 +48,7 @@ import net.citizensnpcs.trait.CurrentLocation; import net.citizensnpcs.trait.Gravity; import net.citizensnpcs.trait.HologramTrait; import net.citizensnpcs.trait.ScoreboardTrait; +import net.citizensnpcs.trait.SitTrait; import net.citizensnpcs.trait.SneakTrait; import net.citizensnpcs.util.ChunkCoord; import net.citizensnpcs.util.Messages; @@ -79,7 +80,7 @@ public class CitizensNPC extends AbstractNPC { } NPCDespawnEvent event = new NPCDespawnEvent(this, reason); if (reason == DespawnReason.CHUNK_UNLOAD) { - event.setCancelled(data().get(NPC.KEEP_CHUNK_LOADED_METADATA, Setting.KEEP_CHUNKS_LOADED.asBoolean())); + event.setCancelled(data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean())); } Bukkit.getPluginManager().callEvent(event); if (event.isCancelled() && reason != DespawnReason.DEATH) { @@ -159,6 +160,13 @@ public class CitizensNPC extends AbstractNPC { return getEntity() != null && NMS.isValid(getEntity()); } + @Override + public boolean isUpdating(NPCUpdate update) { + return update == NPCUpdate.PACKET + ? updateCounter > data().get(NPC.Metadata.PACKET_UPDATE_DELAY, Setting.PACKET_UPDATE_DELAY.asInt()) + : false; + } + @Override public void load(final DataKey root) { super.load(root); @@ -195,11 +203,18 @@ public class CitizensNPC extends AbstractNPC { @Override public void save(DataKey root) { super.save(root); - if (!data().get(NPC.SHOULD_SAVE_METADATA, true)) + if (!data().get(NPC.Metadata.SHOULD_SAVE, true)) return; navigator.save(root.getRelative("navigator")); } + @Override + public void scheduleUpdate(NPCUpdate update) { + if (update == NPCUpdate.PACKET) { + updateCounter = data().get(NPC.Metadata.PACKET_UPDATE_DELAY, Setting.PACKET_UPDATE_DELAY.asInt()) + 1; + } + } + @Override public void setBukkitEntityType(EntityType type) { EntityController controller = EntityControllers.createForType(type); @@ -407,13 +422,16 @@ public class CitizensNPC extends AbstractNPC { @Override public void teleport(Location location, TeleportCause reason) { - super.teleport(location, reason); if (!isSpawned()) return; + if (hasTrait(SitTrait.class)) { + getOrAddTrait(SitTrait.class).setSitting(location); + } Location npcLoc = getEntity().getLocation(CACHE_LOCATION); - if (isSpawned() && npcLoc.getWorld() == location.getWorld() && npcLoc.distanceSquared(location) < 1) { + if (isSpawned() && npcLoc.getWorld() == location.getWorld() && npcLoc.distance(location) < 1) { NMS.setHeadYaw(getEntity(), location.getYaw()); } + super.teleport(location, reason); } @Override @@ -463,9 +481,8 @@ public class CitizensNPC extends AbstractNPC { } boolean isLiving = getEntity() instanceof LivingEntity; - int packetUpdateDelay = data().get(NPC.Metadata.PACKET_UPDATE_DELAY, Setting.PACKET_UPDATE_DELAY.asInt()); - if (updateCounter++ > packetUpdateDelay || data().has(NPC.Metadata.FORCE_PACKET_UPDATE)) { - if (data().get(NPC.KEEP_CHUNK_LOADED_METADATA, Setting.KEEP_CHUNKS_LOADED.asBoolean())) { + if (isUpdating(NPCUpdate.PACKET)) { + if (data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean())) { ChunkCoord currentCoord = new ChunkCoord(getStoredLocation()); if (!currentCoord.equals(cachedCoord)) { resetCachedCoord(); @@ -478,7 +495,6 @@ public class CitizensNPC extends AbstractNPC { updateScoreboard(); } updateCounter = 0; - data().remove(NPC.Metadata.FORCE_PACKET_UPDATE); } updateCustomNameVisibility(); @@ -502,13 +518,15 @@ public class CitizensNPC extends AbstractNPC { } } - if (SUPPORT_SILENT && data().has(NPC.SILENT_METADATA)) { + if (SUPPORT_SILENT && data().has(NPC.Metadata.SILENT)) { try { getEntity().setSilent(Boolean.parseBoolean(data().get(NPC.Metadata.SILENT).toString())); } catch (NoSuchMethodError e) { SUPPORT_SILENT = false; } } + + updateCounter++; } catch (Exception ex) { Throwable error = Throwables.getRootCause(ex); Messaging.logTr(Messages.EXCEPTION_UPDATING_NPC, getId(), error.getMessage()); @@ -542,8 +560,8 @@ public class CitizensNPC extends AbstractNPC { return; if (!Util.isAlwaysFlyable(type)) return; - if (!data().has(NPC.FLYABLE_METADATA)) { - data().setPersistent(NPC.FLYABLE_METADATA, true); + if (!data().has(NPC.Metadata.FLYABLE)) { + data().setPersistent(NPC.Metadata.FLYABLE, true); } if (!hasTrait(Gravity.class)) { getOrAddTrait(Gravity.class).setEnabled(true); @@ -580,6 +598,8 @@ public class CitizensNPC extends AbstractNPC { private static boolean SUPPORT_GLOWING = true; private static boolean SUPPORT_NODAMAGE_TICKS = true; private static boolean SUPPORT_PICKUP_ITEMS = true; + private static boolean SUPPORT_SILENT = true; + private static boolean SUPPORT_USE_ITEM = true; } diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java index 6038cce1a..9053f71cd 100644 --- a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java +++ b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java @@ -17,6 +17,7 @@ import net.citizensnpcs.api.ai.NavigatorParameters; import net.citizensnpcs.api.ai.TargetType; import net.citizensnpcs.api.ai.event.CancelReason; import net.citizensnpcs.api.astar.AStarMachine; +import net.citizensnpcs.api.astar.AStarMachine.AStarState; import net.citizensnpcs.api.astar.pathfinder.BlockExaminer; import net.citizensnpcs.api.astar.pathfinder.BlockSource; import net.citizensnpcs.api.astar.pathfinder.MinecraftBlockExaminer; @@ -30,12 +31,10 @@ import net.citizensnpcs.util.Util; public class AStarNavigationStrategy extends AbstractPathStrategy { private final Location destination; - private int iterations; private final NPC npc; private final NavigatorParameters params; private Path plan; - private boolean planned = false; - private AStarMachine.AStarState state; + private AStarPlanner planner; private Vector vector; public AStarNavigationStrategy(NPC npc, Iterable path, NavigatorParameters params) { @@ -44,7 +43,7 @@ public class AStarNavigationStrategy extends AbstractPathStrategy { this.params = params; this.destination = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld()); this.npc = npc; - setPlan(new Path(list)); + this.plan = new Path(list); } public AStarNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) { @@ -69,71 +68,28 @@ public class AStarNavigationStrategy extends AbstractPathStrategy { return destination; } - public void initialisePathfinder() { - params.examiner(new BlockExaminer() { - @Override - public float getCost(BlockSource source, PathPoint point) { - Vector pos = point.getVector(); - Material above = source.getMaterialAt(pos.setY(pos.getY() + 1)); - return params.avoidWater() && (MinecraftBlockExaminer.isLiquid(above) - || MinecraftBlockExaminer.isLiquidOrInLiquid(pos.toLocation(source.getWorld()).getBlock())) ? 1F - : 0F; - } - - @Override - public PassableState isPassable(BlockSource source, PathPoint point) { - return PassableState.IGNORE; - } - }); - Location location = npc.getEntity().getLocation(); - VectorGoal goal = new VectorGoal(destination, (float) params.pathDistanceMargin()); - state = ASTAR.getStateFor(goal, - new VectorNode(goal, location, new NMSChunkBlockSource(location, params.range()), params.examiners())); - } - - public void setPlan(Path path) { - this.plan = path; - this.planned = true; - if (plan == null || plan.isComplete()) { - setCancelReason(CancelReason.STUCK); - } else { - vector = plan.getCurrentVector(); - if (params.debug()) { - plan.debug(); - } - } - } - @Override public void stop() { if (plan != null && params.debug()) { plan.debugEnd(); } - state = null; plan = null; } @Override public boolean update() { - if (!planned) { - if (state == null) { - initialisePathfinder(); + if (plan == null) { + if (planner == null) { + planner = new AStarPlanner(params, npc.getStoredLocation(), destination); } - int maxIterations = Setting.MAXIMUM_ASTAR_ITERATIONS.asInt(); - int iterationsPerTick = Setting.ASTAR_ITERATIONS_PER_TICK.asInt(); - Path plan = ASTAR.run(state, iterationsPerTick); - if (plan == null) { - if (state.isEmpty()) { - setCancelReason(CancelReason.STUCK); - } - if (iterationsPerTick > 0 && maxIterations > 0) { - iterations += iterationsPerTick; - if (iterations > maxIterations) { - setCancelReason(CancelReason.STUCK); - } - } - } else { - setPlan(plan); + CancelReason reason = planner.tick(Setting.ASTAR_ITERATIONS_PER_TICK.asInt(), + Setting.MAXIMUM_ASTAR_ITERATIONS.asInt()); + if (reason != null) { + setCancelReason(reason); + } + plan = planner.plan; + if (plan != null) { + planner = null; } } if (getCancelReason() != null || plan == null || plan.isComplete()) { @@ -141,7 +97,7 @@ public class AStarNavigationStrategy extends AbstractPathStrategy { } Location loc = npc.getEntity().getLocation(NPC_LOCATION); /* Proper door movement - gets stuck on corners at times - + Block block = currLoc.getWorld().getBlockAt(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ()); if (MinecraftBlockExaminer.isDoor(block.getType())) { Door door = (Door) block.getState().getData(); @@ -184,6 +140,65 @@ public class AStarNavigationStrategy extends AbstractPathStrategy { return false; } + public static class AStarPlanner { + Location from; + int iterations; + NavigatorParameters params; + Path plan; + AStarState state; + Location to; + + public AStarPlanner(NavigatorParameters params, Location from, Location to) { + this.params = params; + this.from = from; + this.to = to; + params.examiner(new BlockExaminer() { + @Override + public float getCost(BlockSource source, PathPoint point) { + Vector pos = point.getVector(); + Material above = source.getMaterialAt(pos.setY(pos.getY() + 1)); + return params.avoidWater() && (MinecraftBlockExaminer.isLiquid(above) + || MinecraftBlockExaminer.isLiquidOrInLiquid(pos.toLocation(source.getWorld()).getBlock())) + ? 1F + : 0F; + } + + @Override + public PassableState isPassable(BlockSource source, PathPoint point) { + return PassableState.IGNORE; + } + }); + } + + public CancelReason tick(int iterationsPerTick, int maxIterations) { + if (plan != null) + return null; + if (state == null) { + VectorGoal goal = new VectorGoal(to, (float) params.pathDistanceMargin()); + state = ASTAR.getStateFor(goal, + new VectorNode(goal, from, new NMSChunkBlockSource(from, params.range()), params.examiners())); + } + Path plan = ASTAR.run(state, iterationsPerTick); + if (plan == null) { + if (state.isEmpty()) { + return CancelReason.STUCK; + } + if (iterationsPerTick > 0 && maxIterations > 0) { + iterations += iterationsPerTick; + if (iterations > maxIterations) { + return CancelReason.STUCK; + } + } + } else { + this.plan = plan; + if (params.debug()) { + plan.debug(); + } + } + return null; + } + } + private static final AStarMachine ASTAR = AStarMachine.createWithDefaultStorage(); private static final Location NPC_LOCATION = new Location(null, 0, 0, 0); } diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java index 65a65c081..3430b5cfc 100644 --- a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java +++ b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java @@ -36,6 +36,8 @@ import net.citizensnpcs.api.astar.pathfinder.MinecraftBlockExaminer; import net.citizensnpcs.api.astar.pathfinder.SwimmingExaminer; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.DataKey; +import net.citizensnpcs.npc.ai.AStarNavigationStrategy.AStarPlanner; +import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; import net.citizensnpcs.trait.RotationTrait; import net.citizensnpcs.trait.RotationTrait.PacketRotationSession; import net.citizensnpcs.trait.RotationTrait.RotationParams; @@ -65,7 +67,7 @@ public class CitizensNavigator implements Navigator, Runnable { public CitizensNavigator(NPC npc) { this.npc = npc; - if (npc.data().get(NPC.DISABLE_DEFAULT_STUCK_ACTION_METADATA, false)) { + if (npc.data().get(NPC.Metadata.DISABLE_DEFAULT_STUCK_ACTION, false)) { defaultParams.stuckAction(null); } defaultParams.examiner(new SwimmingExaminer(npc)); @@ -81,6 +83,23 @@ public class CitizensNavigator implements Navigator, Runnable { stopNavigating(reason); } + @Override + public boolean canNavigateTo(Location dest) { + return canNavigateTo(dest, defaultParams.clone()); + } + + @Override + public boolean canNavigateTo(Location dest, NavigatorParameters params) { + if (defaultParams.useNewPathfinder()) { + AStarPlanner planner = new AStarPlanner(params, npc.getStoredLocation(), dest); + planner.tick(Setting.MAXIMUM_ASTAR_ITERATIONS.asInt(), Setting.MAXIMUM_ASTAR_ITERATIONS.asInt()); + return planner.plan != null; + } else { + MCNavigator nav = NMS.getTargetNavigator(npc.getEntity(), dest, params); + return nav.getCancelReason() == null; + } + } + @Override public NavigatorParameters getDefaultParameters() { return defaultParams; @@ -419,8 +438,7 @@ public class CitizensNavigator implements Navigator, Runnable { private void switchParams() { localParams = defaultParams.clone(); - if (!npc.data().has(NPC.PATHFINDER_OPEN_DOORS_METADATA) ? Setting.NEW_PATHFINDER_OPENS_DOORS.asBoolean() - : npc.data(). get(NPC.PATHFINDER_OPEN_DOORS_METADATA)) { + if (npc.data().get(NPC.Metadata.PATHFINDER_OPEN_DOORS, Setting.NEW_PATHFINDER_OPENS_DOORS.asBoolean())) { localParams.examiner(new DoorExaminer()); } if (Setting.NEW_PATHFINDER_CHECK_BOUNDING_BOXES.asBoolean()) { diff --git a/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java b/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java index d13b6be0e..958975962 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java @@ -142,12 +142,12 @@ public class ArmorStandTrait extends Trait { setMarker(true); setVisible(false); npc.setProtected(true); - npc.data().set(NPC.NAMEPLATE_VISIBLE_METADATA, false); + npc.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, false); } public void setAsPointEntityWithName() { setAsPointEntity(); - npc.data().set(NPC.NAMEPLATE_VISIBLE_METADATA, true); + npc.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, true); } /** diff --git a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java index 7c6b74ce9..fd9471099 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java @@ -54,7 +54,7 @@ public class ScoreboardTrait extends Trait { public void createTeam(String entityName) { String teamName = Util.getTeamName(npc.getUniqueId()); - npc.data().set(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA, teamName); + npc.data().set(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME, teamName); Scoreboard scoreboard = Util.getDummyScoreboard(); Team team = scoreboard.getTeam(teamName); if (team == null) { @@ -84,11 +84,11 @@ public class ScoreboardTrait extends Trait { if (npc.getEntity() == null) return; String name = npc.getEntity() instanceof Player ? npc.getEntity().getName() : npc.getUniqueId().toString(); - String teamName = npc.data().get(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA, ""); + String teamName = npc.data().get(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME, ""); if (teamName.isEmpty()) return; Team team = Util.getDummyScoreboard().getTeam(teamName); - npc.data().remove(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA); + npc.data().remove(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME); if (team == null) return; if (team.hasEntry(name)) { @@ -132,7 +132,7 @@ public class ScoreboardTrait extends Trait { if (!Setting.USE_SCOREBOARD_TEAMS.asBoolean()) { team.unregister(); - npc.data().remove(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA); + npc.data().remove(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME); return; } @@ -173,7 +173,7 @@ public class ScoreboardTrait extends Trait { if (SUPPORT_COLLIDABLE_SETOPTION) { try { - OptionStatus collide = npc.data(). get(NPC.COLLIDABLE_METADATA, !npc.isProtected()) + OptionStatus collide = npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()) ? OptionStatus.ALWAYS : OptionStatus.NEVER; if (collide != team.getOption(Option.COLLISION_RULE)) { diff --git a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java index 5f8f1b91e..8c78ed673 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java @@ -34,9 +34,11 @@ import net.citizensnpcs.api.gui.Menu; import net.citizensnpcs.api.gui.MenuContext; import net.citizensnpcs.api.gui.MenuPattern; import net.citizensnpcs.api.gui.MenuSlot; +import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.persistence.Persist; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.TraitName; +import net.citizensnpcs.api.trait.trait.Owner; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.api.util.Placeholders; import net.citizensnpcs.trait.shop.CommandAction; @@ -109,11 +111,17 @@ public class ShopTrait extends Trait { this.name = name; } + public boolean canEdit(NPC npc, Player sender) { + return sender.hasPermission("citizens.admin") || sender.hasPermission("citizens.npc.shop.edit") + || sender.hasPermission("citizens.npc.shop.edit." + getName()) + || npc.getOrAddTrait(Owner.class).isOwnedBy(sender); + } + public void display(Player sender) { if (viewPermission != null && !sender.hasPermission(viewPermission)) return; if (pages.size() == 0) { - Messaging.send(sender, "Empty shop"); + Messaging.sendError(sender, "Empty shop"); return; } InventoryMenu.createSelfRegistered(new NPCShopViewer(this, sender)).present(sender); diff --git a/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java b/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java index d9aaf7c82..a1394c0c5 100644 --- a/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java @@ -28,9 +28,9 @@ public class SneakTrait extends Trait { @Override public void run() { - if (npc.data().has(NPC.SNEAKING_METADATA)) { - setSneaking(npc.data().get(NPC.SNEAKING_METADATA)); - npc.data().remove(NPC.SNEAKING_METADATA); + if (npc.data().has(NPC.Metadata.SNEAKING)) { + setSneaking(npc.data().get(NPC.Metadata.SNEAKING)); + npc.data().remove(NPC.Metadata.SNEAKING); } } diff --git a/main/src/main/java/net/citizensnpcs/trait/text/Text.java b/main/src/main/java/net/citizensnpcs/trait/text/Text.java index 9952d8ae5..bd20f06b4 100644 --- a/main/src/main/java/net/citizensnpcs/trait/text/Text.java +++ b/main/src/main/java/net/citizensnpcs/trait/text/Text.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import java.util.Random; import java.util.UUID; -import java.util.concurrent.TimeUnit; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; @@ -152,12 +151,11 @@ public class Text extends Trait implements Runnable, Listener { @EventHandler private void onRightClick(NPCRightClickEvent event) { - if (!event.getNPC().equals(npc)) + if (!event.getNPC().equals(npc) || text.size() == 0) return; String localPattern = itemInHandPattern.equals("default") ? Setting.TALK_ITEM.asString() : itemInHandPattern; if (Util.matchesItemInHand(event.getClicker(), localPattern) && !shouldTalkClose()) { - sendCooldownMessage(event.getClicker()); - event.setCancelled(true); + talk(event.getClicker()); } } @@ -174,16 +172,13 @@ public class Text extends Trait implements Runnable, Listener { @Override public void run() { - if (!npc.isSpawned()) - return; - - if (!talkClose) + if (!npc.isSpawned() || !talkClose || text.size() == 0) return; for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(npc.getEntity().getLocation(), range)) { if (player.getGameMode() == GameMode.SPECTATOR) continue; - sendCooldownMessage(player); + talk(player); } } @@ -202,26 +197,6 @@ public class Text extends Trait implements Runnable, Listener { } } - private void sendCooldownMessage(Player player) { - Long cooldown = cooldowns.get(player.getUniqueId()); - if (cooldown != null) { - if (System.currentTimeMillis() < cooldown) - return; - - cooldowns.remove(player.getUniqueId()); - } - - sendText(player); - - int secondsDelta = delay != -1 ? delay - : RANDOM.nextInt(Setting.TALK_CLOSE_MAXIMUM_COOLDOWN.asInt()) - + Setting.TALK_CLOSE_MINIMUM_COOLDOWN.asInt(); - if (secondsDelta <= 0) - return; - long millisecondsDelta = TimeUnit.MILLISECONDS.convert(secondsDelta, TimeUnit.SECONDS); - cooldowns.put(player.getUniqueId(), System.currentTimeMillis() + millisecondsDelta); - } - boolean sendPage(CommandSender player, int page) { Paginator paginator = new Paginator().header("Current Texts").enablePageSwitcher("/npc text page $page"); for (int i = 0; i < text.size(); i++) { @@ -292,9 +267,20 @@ public class Text extends Trait implements Runnable, Listener { return talkClose; } - @Deprecated - public boolean toggle() { - return toggleTalkClose(); + private void talk(Player player) { + Long cooldown = cooldowns.get(player.getUniqueId()); + if (cooldown != null) { + if (System.currentTimeMillis() < cooldown) + return; + + cooldowns.remove(player.getUniqueId()); + } + + sendText(player); + + if (delay <= 0) + return; + cooldowns.put(player.getUniqueId(), System.currentTimeMillis() + (delay * 50)); } /** diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index fb2e87d3c..23ca08d52 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -486,8 +486,8 @@ public class NMS { BRIDGE.playAnimation(animation, player, radius); } - public static void playerTick(Player entity) { - BRIDGE.playerTick(entity); + public static Runnable playerTicker(Player entity) { + return BRIDGE.playerTicker(entity); } public static void registerEntityClass(Class clazz) { @@ -689,6 +689,7 @@ public class NMS { private static Object UNSAFE; private static MethodHandle UNSAFE_FIELD_OFFSET; private static MethodHandle UNSAFE_PUT_OBJECT; + private static MethodHandle UNSAFE_STATIC_FIELD_OFFSET; static { diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java index be6c29f34..291d3b135 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java +++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java @@ -130,7 +130,7 @@ public interface NMSBridge { public void playAnimation(PlayerAnimation animation, Player player, int radius); - public void playerTick(Player entity); + public Runnable playerTicker(Player entity); public void registerEntityClass(Class clazz); @@ -146,9 +146,9 @@ public interface NMSBridge { public void sendPositionUpdate(Player excluding, Entity from, Location location); - public void sendRotationNearby(Entity from, float bodyYaw, float headYaw, float pitch); + public void sendRotationNearby(Entity from, float bodyYaw, float headYaw, float pitch);; - public boolean sendTabListAdd(Player recipient, Player listPlayer);; + public boolean sendTabListAdd(Player recipient, Player listPlayer); public void sendTabListRemove(Player recipient, Collection skinnableNPCs); @@ -166,13 +166,13 @@ public interface NMSBridge { throw new UnsupportedOperationException(); } - public void setCustomName(Entity entity, Object component, String string); + public void setCustomName(Entity entity, Object component, String string);; - public void setDestination(Entity entity, double x, double y, double z, float speed);; + public void setDestination(Entity entity, double x, double y, double z, float speed); public void setEndermanAngry(Enderman enderman, boolean angry); - public void setHeadYaw(Entity entity, float yaw); + public void setHeadYaw(Entity entity, float yaw);; public void setKnockbackResistance(LivingEntity entity, double d);; @@ -180,13 +180,13 @@ public interface NMSBridge { throw new UnsupportedOperationException(); }; - public void setNavigationTarget(Entity handle, Entity target, float speed);; + public void setNavigationTarget(Entity handle, Entity target, float speed); - public void setNoGravity(Entity entity, boolean nogravity); + public void setNoGravity(Entity entity, boolean nogravity);; public default void setPandaSitting(Entity entity, boolean sitting) { throw new UnsupportedOperationException(); - }; + } public default void setPeekShulker(Entity entity, int peek) { throw new UnsupportedOperationException(); diff --git a/main/src/main/java/net/citizensnpcs/util/PlayerUpdateTask.java b/main/src/main/java/net/citizensnpcs/util/PlayerUpdateTask.java index d662b6766..1e3e307ed 100644 --- a/main/src/main/java/net/citizensnpcs/util/PlayerUpdateTask.java +++ b/main/src/main/java/net/citizensnpcs/util/PlayerUpdateTask.java @@ -11,6 +11,10 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.npc.ai.NPCHolder; + public class PlayerUpdateTask extends BukkitRunnable { @Override public void cancel() { @@ -43,14 +47,35 @@ public class PlayerUpdateTask extends BukkitRunnable { PLAYERS.remove(entity.getUniqueId()); } for (Entity entity : PLAYERS_PENDING_ADD) { - PLAYERS.put(entity.getUniqueId(), (Player) entity); + PlayerTick rm = PLAYERS.remove(entity.getUniqueId()); + if (rm != null) { + NPC old = ((NPCHolder) rm).getNPC(); + NPC next = ((NPCHolder) entity).getNPC(); + Messaging.severe(old == next ? "Player registered twice" + : "Player registered twice with different NPC instances", rm.entity.getUniqueId()); + rm.entity.remove(); + } + PLAYERS.put(entity.getUniqueId(), new PlayerTick((Player) entity)); } PLAYERS_PENDING_ADD.clear(); PLAYERS_PENDING_REMOVE.clear(); - for (Player entity : PLAYERS.values()) { + PLAYERS.values().forEach(Runnable::run); + } + + private static class PlayerTick implements Runnable { + Player entity; + Runnable tick; + + public PlayerTick(Player player) { + entity = player; + tick = NMS.playerTicker(player); + } + + @Override + public void run() { if (entity.isValid()) { - NMS.playerTick(entity); + tick.run(); } } } @@ -76,10 +101,10 @@ public class PlayerUpdateTask extends BukkitRunnable { PLAYERS_PENDING_ADD.add(entity); } - private static Map PLAYERS = new HashMap(); - private static List PLAYERS_PENDING_ADD = new ArrayList(); - private static List PLAYERS_PENDING_REMOVE = new ArrayList(); - private static Map TICKERS = new HashMap(); - private static List TICKERS_PENDING_ADD = new ArrayList(); - private static List TICKERS_PENDING_REMOVE = new ArrayList(); + private static Map PLAYERS = new HashMap<>(); + private static List PLAYERS_PENDING_ADD = new ArrayList<>(); + private static List PLAYERS_PENDING_REMOVE = new ArrayList<>(); + private static Map TICKERS = new HashMap<>(); + private static List TICKERS_PENDING_ADD = new ArrayList<>(); + private static List TICKERS_PENDING_REMOVE = new ArrayList<>(); } diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java index a2b4cb248..9f76fd6bb 100644 --- a/main/src/main/java/net/citizensnpcs/util/Util.java +++ b/main/src/main/java/net/citizensnpcs/util/Util.java @@ -56,7 +56,7 @@ public class Util { return new Vector(x, y, z); } boolean allowed = !npc.isProtected() - || (npc.data().has(NPC.COLLIDABLE_METADATA) && npc.data(). get(NPC.COLLIDABLE_METADATA)); + || (npc.data().has(NPC.Metadata.COLLIDABLE) && npc.data(). get(NPC.Metadata.COLLIDABLE)); if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { return allowed ? new Vector(x, y, z) : null; } diff --git a/main/src/main/resources/messages_en.properties b/main/src/main/resources/messages_en.properties index 1347f3856..adf869034 100644 --- a/main/src/main/resources/messages_en.properties +++ b/main/src/main/resources/messages_en.properties @@ -350,7 +350,7 @@ citizens.editors.text.invalid-range=Invalid range. citizens.editors.text.invalid-delay=Invalid delay. citizens.editors.text.random-talker-set=[[Random talking]] set to [[{0}]]. citizens.editors.text.range-set=[[Range]] set to [[{0}]]. -citizens.editors.text.delay-set=[[Delay]] set to [[{0}]] seconds. +citizens.editors.text.delay-set=[[Delay]] set to [[{0}]] ticks. citizens.editors.text.realistic-looking-set=[[Realistic looking]] set to [[{0}]]. citizens.editors.text.speech-bubbles-set=[[Speech bubbles]] set to [[{0}]]. citizens.editors.text.start-prompt=Add text | default to clear)">item | range | delay
{0}talk close | {1}random | {2}speech bubbles | {3}realistic diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java index b5fd9e7d3..1130a7483 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java @@ -71,12 +71,12 @@ public class BatController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -115,7 +115,7 @@ public class BatController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -136,7 +136,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java index 43c8d6185..e52ad8b7a 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java @@ -68,12 +68,12 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -112,7 +112,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -132,7 +132,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java index b8771d8fd..a4f656537 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java @@ -77,12 +77,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -158,7 +158,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java index 7bf35b575..3aaf73f98 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java @@ -88,12 +88,12 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -148,7 +148,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -168,7 +168,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java index 234a18ddc..8d33b4a44 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java @@ -103,12 +103,12 @@ public class CowController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class CowController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -183,7 +183,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java index 8a0877352..04a28699e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java @@ -88,12 +88,12 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -147,7 +147,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java index c90db1bb6..2cf38145b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java @@ -68,12 +68,12 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -111,7 +111,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -131,7 +131,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java index 645b27673..16c584a46 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java @@ -77,12 +77,12 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,7 +156,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java index bb9f7cebc..3bc9a5d2e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java @@ -77,12 +77,12 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,7 +156,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java index f2ab4c1a5..9ddbbaa0d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java @@ -22,6 +22,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_10_R1.network.EmptyNetHandler; @@ -73,7 +74,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final CitizensNPC npc; private final Location packetLocationCache = new Location(null, 0, 0, 0); private final SkinPacketTracker skinTracker; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -114,12 +114,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -278,7 +278,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -336,18 +336,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable super.m(); if (npc == null) return; - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } this.noclip = isSpectator(); Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); - boolean navigating = npc.getNavigator().isNavigating(); - updatePackets(navigating); - - if (noDamageTicks > 0) { - --noDamageTicks; - } + updatePackets(npc.getNavigator().isNavigating()); npc.update(); } @@ -428,10 +420,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java index cc98ea070..405295b46 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java @@ -54,12 +54,12 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -103,7 +103,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,7 +123,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java index 621066f2a..03fab3ac5 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java @@ -63,12 +63,12 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java index 3adeab52c..3e21cde9e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java @@ -63,12 +63,12 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -143,7 +143,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java index 507dfe660..a35934ed9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java @@ -86,12 +86,12 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -154,7 +154,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -174,7 +174,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java index 745e24c08..ccd73e58c 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java @@ -63,12 +63,12 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java index 1ed8de5fa..5380564d3 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java @@ -69,12 +69,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -155,7 +155,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java index e15c03e2b..d45ddd30d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java @@ -85,12 +85,12 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -144,7 +144,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -164,7 +164,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java index aa18da4cd..e812daff5 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java @@ -74,12 +74,12 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,7 +160,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java index e08eebbe1..d02d11f6f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java @@ -75,12 +75,12 @@ public class PigController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class PigController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -163,7 +163,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java index f13e3e918..6fcebce1e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java @@ -64,12 +64,12 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -143,7 +143,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java index c616fca9f..2ed385281 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java @@ -65,12 +65,12 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -109,7 +109,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -130,7 +130,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java index 2286160dd..fe41c145f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java @@ -75,12 +75,12 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,7 +160,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java index 146e0e8cc..0f73fdc3f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java @@ -74,12 +74,12 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -133,7 +133,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -153,7 +153,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java index db41196e5..80823cb87 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java @@ -64,12 +64,12 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -143,7 +143,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java index b91b4b425..f116c3345 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java @@ -63,12 +63,12 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java index 2a68ca139..4e8ecb3da 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java @@ -63,12 +63,12 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java index aa2ea430f..046f5594c 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java @@ -69,12 +69,12 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,7 +156,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java index 1ecca779b..bb07db264 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java @@ -63,12 +63,12 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java index 98f8d238b..f13797192 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java @@ -63,12 +63,12 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java index 1e2937612..6c3530e48 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java @@ -63,12 +63,12 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java index 228464de5..a5245ca6b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java @@ -80,7 +80,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; } return super.a(entityhuman, enumhand, itemstack); @@ -88,12 +88,12 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -157,7 +157,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -177,7 +177,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java index 6f049975d..1d09da85f 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java @@ -63,12 +63,12 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java index 542ff8b5c..67c897f85 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java @@ -54,12 +54,12 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -103,7 +103,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,7 +123,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java index c740ee8e7..0ec2b577a 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java @@ -76,12 +76,12 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,7 +156,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java index 3a161ba28..47f065c75 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java @@ -63,12 +63,12 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect bV() { - return NMSImpl.getSoundEffect(npc, super.bV(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bV(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index 18eb344be..050a36390 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -891,8 +891,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).k_(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::k_; } @Override @@ -1719,7 +1719,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : SoundEffect.a.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -1748,9 +1748,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data)); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java index 00a37f437..31f3e6aed 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java @@ -71,12 +71,12 @@ public class BatController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -115,7 +115,7 @@ public class BatController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -137,7 +137,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java index bd10ea34e..0cb5d0ca9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java @@ -68,12 +68,12 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -112,7 +112,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -133,7 +133,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java index 3f028ebbd..9a26dc8f0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java @@ -77,12 +77,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -159,7 +159,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java index 544a1797b..f317c528a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java @@ -88,12 +88,12 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -148,7 +148,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -169,7 +169,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java index 22fe06d2b..b3ef57bad 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java @@ -103,12 +103,12 @@ public class CowController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class CowController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java index 3d436ac30..eb3ab92da 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java @@ -80,12 +80,12 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,7 +160,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java index 0b42587ac..b5cc77ee1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java @@ -68,12 +68,12 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -111,7 +111,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -132,7 +132,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java index 08bda24d4..77e1c9341 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java @@ -77,12 +77,12 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -157,7 +157,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java index 492975a59..6f8c611c8 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java @@ -77,12 +77,12 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -157,7 +157,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java index cc600a21f..da8a6d6f0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java @@ -22,6 +22,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_11_R1.network.EmptyNetHandler; @@ -75,7 +76,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final CitizensNPC npc; private final Location packetLocationCache = new Location(null, 0, 0, 0); private final SkinPacketTracker skinTracker; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -120,9 +120,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable if (npc == null) return; this.noclip = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); boolean navigating = npc.getNavigator().isNavigating() || controllerMove.a(); @@ -133,12 +130,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -247,7 +244,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public IChatBaseComponent getPlayerListName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new ChatComponentText(""); } return super.getPlayerListName(); @@ -305,7 +302,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -434,10 +431,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java index 3bfdc7b0e..5c996d5ad 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java @@ -63,12 +63,12 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -144,7 +144,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java index 380b062ca..b53fcedc7 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java @@ -54,12 +54,12 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -103,7 +103,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,7 +124,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java index a76943e9d..a3ea911cc 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java @@ -63,12 +63,12 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -143,7 +143,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java index fdaa92558..97a04c2e4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java @@ -63,12 +63,12 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -144,7 +144,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java index 48ccc1098..34fec045f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java @@ -63,12 +63,12 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -144,7 +144,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java index 68798e959..2fd997af5 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java @@ -86,12 +86,12 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java index 569890fe9..2d9435df4 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java @@ -86,12 +86,12 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java index 94f4ec2e6..35b0a4f4b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java @@ -86,12 +86,12 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java index 6b2db61bc..955eccbe3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java @@ -87,12 +87,12 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -147,7 +147,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -168,7 +168,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java index b294bf138..9688f11a5 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java @@ -87,12 +87,12 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -147,7 +147,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -168,7 +168,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java index 32ec3c759..12f27ac04 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java @@ -63,12 +63,12 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -143,7 +143,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java index 1cf62f801..a8cc7a9d6 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java @@ -86,12 +86,12 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java index 6af0733cd..c57b509a6 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java @@ -77,12 +77,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -164,7 +164,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java index 4e097b9d4..17fdb9ae0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java @@ -84,12 +84,12 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -164,7 +164,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java index e48a42167..4e8320b82 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java @@ -74,12 +74,12 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,7 +161,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java index 04d52eb3e..d98e96b24 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java @@ -75,12 +75,12 @@ public class PigController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -141,7 +141,7 @@ public class PigController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -162,7 +162,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java index 29b8f6535..848f9e79e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java @@ -64,12 +64,12 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -144,7 +144,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java index 88077671e..c8c60c4e2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java @@ -65,12 +65,12 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -109,7 +109,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -131,7 +131,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java index ae1975f98..3889810dd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java @@ -75,12 +75,12 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,7 +161,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java index d404e9a10..dd4dd77ba 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java @@ -74,12 +74,12 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -133,7 +133,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -154,7 +154,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java index 994846298..9e3529090 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java @@ -74,12 +74,12 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -133,7 +133,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -153,7 +153,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java index 9f3a2b797..6cb741401 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java @@ -63,12 +63,12 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java index eb1f0547d..1204c9f25 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java @@ -63,12 +63,12 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java index 63bd56ca6..2585d1766 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java @@ -63,12 +63,12 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java index 6d673d49b..ab457a6dd 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java @@ -63,12 +63,12 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java index ca05ab237..16365f082 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java @@ -77,12 +77,12 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -144,7 +144,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -164,7 +164,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java index fefacff2c..d99bfcc90 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java @@ -63,12 +63,12 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java index 4697d99ee..fc1a53dae 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java @@ -63,12 +63,12 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java index 99603be81..6dcca4fc5 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java @@ -63,12 +63,12 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java index 920730222..ffa0241c9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java @@ -57,12 +57,12 @@ public class VexController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -101,7 +101,7 @@ public class VexController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,7 +122,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java index 64b40fd66..3ba64f667 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java @@ -82,7 +82,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; List list = getOffers(entityhuman); if (list != null) { @@ -94,12 +94,12 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -183,7 +183,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java index 197a141ec..7f09cc6c1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java @@ -74,12 +74,12 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -134,7 +134,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -154,7 +154,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java index 32d28ff8f..732e5cc0a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java @@ -63,12 +63,12 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java index e0999262c..c94e699c1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java @@ -54,12 +54,12 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -103,7 +103,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,7 +123,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java index 6e029d3df..2964b02e0 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java @@ -76,12 +76,12 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,7 +156,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java index 1b6aaf16d..a4d38048e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java @@ -63,12 +63,12 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java index 1f6f66c6a..63461b947 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java @@ -63,12 +63,12 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java index af1a3aecf..17402ee4a 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java @@ -63,12 +63,12 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect bW() { - return NMSImpl.getSoundEffect(npc, super.bW(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEffect bX() { - return NMSImpl.getSoundEffect(npc, super.bX(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect G() { - return NMSImpl.getSoundEffect(npc, super.G(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.G(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,7 +142,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index 7c9e37509..79490d358 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java @@ -949,8 +949,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).playerTick(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::playerTick; } @Override @@ -1785,7 +1785,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : SoundEffect.a.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -1814,9 +1814,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data)); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java index 1371bdfea..42dc0102e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java @@ -72,7 +72,7 @@ public class BatController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class BatController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -118,7 +118,7 @@ public class BatController extends MobEntityController { @Override public SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -140,7 +140,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java index 352a4aa67..a7149aad2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java @@ -69,7 +69,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -84,7 +84,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -115,7 +115,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -136,7 +136,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java index 9b5ff74d9..d6525752e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java @@ -87,7 +87,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -102,7 +102,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -162,7 +162,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java index d8b5d0ea6..2bd9c3d88 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java @@ -98,7 +98,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -113,7 +113,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -151,7 +151,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -172,7 +172,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java index e9cd53408..c90976dbc 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java @@ -113,7 +113,7 @@ public class CowController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -128,7 +128,7 @@ public class CowController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -166,7 +166,7 @@ public class CowController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -187,7 +187,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java index 845f1d724..931e34762 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java @@ -90,7 +90,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -104,7 +104,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -163,7 +163,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java index 2de19fb1b..273db12b0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java @@ -69,7 +69,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -83,7 +83,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -114,7 +114,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,7 +135,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java index 1cb46faf9..b069a006a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java @@ -87,7 +87,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -101,7 +101,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,7 +160,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java index c61ac1541..5ae9a6532 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java @@ -87,7 +87,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -101,7 +101,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,7 +160,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java index 20bb17e8c..f96c6ff17 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java @@ -23,6 +23,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_12_R1.network.EmptyNetHandler; @@ -79,7 +80,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final Location packetLocationCache = new Location(null, 0, 0, 0); private final SkinPacketTracker skinTracker; private PlayerlistTrackerEntry trackerEntry; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -133,9 +133,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable if (npc == null) return; this.noclip = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b(); @@ -146,7 +143,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -161,7 +158,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -267,7 +264,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public IChatBaseComponent getPlayerListName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new ChatComponentText(""); } return super.getPlayerListName(); @@ -332,7 +329,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -460,10 +457,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java index 8214311d2..40b221906 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java @@ -73,7 +73,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -88,7 +88,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -147,7 +147,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java index f2636734b..0b74ae3f4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java @@ -60,7 +60,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -106,7 +106,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -127,7 +127,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java index 8c3334b49..81aa33de6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java @@ -73,7 +73,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -146,7 +146,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java index b1a52545f..b052aa799 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java @@ -73,7 +73,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -88,7 +88,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -147,7 +147,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java index 45d0a7e9d..b8efa0ea0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java @@ -73,7 +73,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -88,7 +88,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -147,7 +147,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java index d41c87c21..48cbd189f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java @@ -102,7 +102,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -125,7 +125,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java index 91786521d..bf7d2f19a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java @@ -102,7 +102,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -125,7 +125,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java index c73d4ffdc..6fd11a858 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java @@ -102,7 +102,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -125,7 +125,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java index 66449fc21..2809fb559 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java @@ -104,7 +104,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -127,7 +127,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -165,7 +165,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -186,7 +186,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java index b528eefbe..c812f901e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java @@ -104,7 +104,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -127,7 +127,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -165,7 +165,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -186,7 +186,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java index 7abb690c3..2d95b5e9c 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java @@ -73,7 +73,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -88,7 +88,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -146,7 +146,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java index 49e5ee240..5237408d6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java @@ -73,7 +73,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -146,7 +146,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java index 22ec18ba5..fbe174398 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java @@ -96,7 +96,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -111,7 +111,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java index 1b9538334..3b2a94e0e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java @@ -87,7 +87,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -101,7 +101,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java index 85dec6466..c314560a2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java @@ -94,7 +94,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -108,7 +108,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java index 02a950e4b..fd02d5103 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java @@ -84,7 +84,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -99,7 +99,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -144,7 +144,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -165,7 +165,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java index af9dffd8d..04c76b1b1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java @@ -66,7 +66,7 @@ public class ParrotController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -81,7 +81,7 @@ public class ParrotController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -112,7 +112,7 @@ public class ParrotController extends MobEntityController { @Override public SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -134,7 +134,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java index a9e2d48f3..64743f13e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java @@ -85,7 +85,7 @@ public class PigController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -106,7 +106,7 @@ public class PigController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -144,7 +144,7 @@ public class PigController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -165,7 +165,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java index 92ca4e9ae..31aa0712f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java @@ -74,7 +74,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -88,7 +88,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -147,7 +147,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java index f0c607a36..e66de3571 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java @@ -66,7 +66,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -81,7 +81,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -112,7 +112,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -134,7 +134,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java index f38a2fa7c..5dc6c4c00 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java @@ -85,7 +85,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -100,7 +100,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -138,7 +138,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -164,7 +164,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java index cf36ade1b..40e20a8d9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java @@ -84,7 +84,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -98,7 +98,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -157,7 +157,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java index 6f51bc084..802362d82 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java @@ -83,7 +83,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -97,7 +97,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -155,7 +155,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java index 6ece97c6e..7424aefbf 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java @@ -73,7 +73,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -143,7 +143,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java index 2c581f2f7..7a0c4ae16 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java @@ -73,7 +73,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java index f6b847c38..51470b596 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java @@ -73,7 +73,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java index 942df5874..5af71aba3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java @@ -73,7 +73,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java index 438dcf3de..52aded3a3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java @@ -87,7 +87,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -102,7 +102,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -147,7 +147,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -167,7 +167,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java index e67c73c60..6a283c373 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java @@ -73,7 +73,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java index 13792ccb0..794e752c2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java @@ -73,7 +73,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java index 1cb02f88a..b2037103d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java @@ -73,7 +73,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java index 260816943..7480242e9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java @@ -58,7 +58,7 @@ public class VexController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -73,7 +73,7 @@ public class VexController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -104,7 +104,7 @@ public class VexController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,7 +125,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java index c8ff5b086..e1165ce3f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java @@ -83,7 +83,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; List list = getOffers(entityhuman); if (list != null) { @@ -104,7 +104,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -119,7 +119,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -166,7 +166,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -186,7 +186,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java index 89f3364c4..04fb4a786 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java @@ -84,7 +84,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -99,7 +99,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -157,7 +157,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java index 9b92319a8..480d467cf 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java @@ -73,7 +73,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java index 973a33566..e2b85c16a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java @@ -55,7 +55,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -69,7 +69,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -106,7 +106,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,7 +126,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java index c74b5da20..c0b10718b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java @@ -86,7 +86,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -101,7 +101,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -159,7 +159,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java index 11dcd2b2d..8470818b8 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java @@ -73,7 +73,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java index c0d6000dd..e87d88c78 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java @@ -73,7 +73,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java index 707b4f6e2..8d5c7943d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java @@ -73,7 +73,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect cf() { - return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cf(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect F() { - return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.F(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -145,7 +145,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java index 99be88d31..52fde2a3a 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java @@ -959,8 +959,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).playerTick(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::playerTick; } @Override @@ -1795,7 +1795,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : SoundEffect.a.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -1824,9 +1824,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data)); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java index 403f0b60f..016f4a656 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java @@ -100,12 +100,12 @@ public class BatController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -115,7 +115,7 @@ public class BatController extends MobEntityController { @Override public SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -165,7 +165,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java index 8cdd96de3..2184229e6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java @@ -97,12 +97,12 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -112,7 +112,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,7 +161,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java index e748c4cd8..2e2d76ada 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java @@ -122,12 +122,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -187,7 +187,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java index d3eabccae..c50712837 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java @@ -136,12 +136,12 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -151,7 +151,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -200,7 +200,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java index bde0f8709..a3ccaa84d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java @@ -142,12 +142,12 @@ public class CodController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -157,7 +157,7 @@ public class CodController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -205,7 +205,7 @@ public class CodController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java index 07a9dadcf..3056abdc5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java @@ -148,12 +148,12 @@ public class CowController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class CowController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -212,7 +212,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java index 5577d2f85..4ac66afc7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java @@ -124,12 +124,12 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -188,7 +188,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java index 5c5f37057..4ce09d1d8 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java @@ -136,12 +136,12 @@ public class DolphinController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -151,7 +151,7 @@ public class DolphinController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -199,7 +199,7 @@ public class DolphinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java index bb378400e..068e578c0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java @@ -121,12 +121,12 @@ public class DrownedController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class DrownedController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class DrownedController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java index a43a48218..c8b466ab7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java @@ -99,12 +99,12 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -114,7 +114,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -163,7 +163,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java index 9759a15f9..cc5aae11e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java @@ -121,12 +121,12 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -185,7 +185,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java index 53ea9e663..80a226f03 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java @@ -121,12 +121,12 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -185,7 +185,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java index 73ecc0ada..f2e407bac 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java @@ -23,6 +23,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_13_R2.network.EmptyNetHandler; @@ -79,7 +80,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final Location packetLocationCache = new Location(null, 0, 0, 0); private final SkinPacketTracker skinTracker; private PlayerlistTrackerEntry trackerEntry; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -146,12 +146,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -250,7 +250,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public IChatBaseComponent getPlayerListName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new ChatComponentText(""); } return super.getPlayerListName(); @@ -315,7 +315,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -435,9 +435,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable if (npc == null) return; this.noclip = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); boolean navigating = npc.getNavigator().isNavigating(); @@ -452,10 +449,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java index b648044a0..275946698 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java @@ -108,12 +108,12 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -172,7 +172,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java index 00e63eeb5..a2fa531b1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java @@ -83,12 +83,12 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -98,7 +98,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -147,7 +147,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java index 447d84b13..868a7d5fd 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java @@ -107,12 +107,12 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -171,7 +171,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java index 8aeed1865..4af7a1736 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java @@ -111,12 +111,12 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -175,7 +175,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java index aa055e51b..6681941c0 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java @@ -111,12 +111,12 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -175,7 +175,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java index 1426bdc51..1ba5eea77 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java @@ -146,12 +146,12 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -161,7 +161,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -210,7 +210,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java index 6004107cf..48e960609 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java @@ -146,12 +146,12 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -161,7 +161,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -210,7 +210,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java index 6b9d32823..809b83e53 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java @@ -146,12 +146,12 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -161,7 +161,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -210,7 +210,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java index 2a00048b5..5a55c9c82 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java @@ -147,12 +147,12 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -162,7 +162,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -211,7 +211,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java index 1c78b4ec3..91193467b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java @@ -147,12 +147,12 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -162,7 +162,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -211,7 +211,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java index c7c48d330..92e0ee190 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java @@ -108,12 +108,12 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -171,7 +171,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java index 47655e165..7b635c78c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java @@ -107,12 +107,12 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -171,7 +171,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java index 640a4e0e7..a6f60acf4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java @@ -131,12 +131,12 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -195,7 +195,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java index ffbbd1e0d..2290a8ad1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java @@ -113,12 +113,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java index f61f732b1..1dbfadfe2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java @@ -128,12 +128,12 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -192,7 +192,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java index 32aa4a856..78573df2f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java @@ -119,12 +119,12 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -134,7 +134,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -190,7 +190,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java index a1aba5bf4..8bc541e13 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java @@ -94,12 +94,12 @@ public class ParrotController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -109,7 +109,7 @@ public class ParrotController extends MobEntityController { @Override public SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -159,7 +159,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java index cc976ca8e..68eff8c9f 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java @@ -119,12 +119,12 @@ public class PhantomController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -134,7 +134,7 @@ public class PhantomController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -189,7 +189,7 @@ public class PhantomController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java index f75aa3b53..7a9118fca 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java @@ -120,12 +120,12 @@ public class PigController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class PigController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -190,7 +190,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java index d24b818fe..8186e4d46 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java @@ -108,12 +108,12 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -172,7 +172,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java index 4eeb570f0..cd3e30425 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java @@ -94,12 +94,12 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -109,7 +109,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -159,7 +159,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java index 115bf82e3..637f00b09 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java @@ -130,12 +130,12 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -193,7 +193,7 @@ public class PufferFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java index 7c77da060..85f26b7dd 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java @@ -121,12 +121,12 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -190,7 +190,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java index 979f535de..00f06c395 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java @@ -128,12 +128,12 @@ public class SalmonController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class SalmonController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -191,7 +191,7 @@ public class SalmonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java index da948aab1..5e4d2b200 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java @@ -118,12 +118,12 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -133,7 +133,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -182,7 +182,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java index d4a7aa97c..38afb77e3 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java @@ -111,12 +111,12 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -174,7 +174,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java index 7da478bcd..c074931f5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java @@ -107,12 +107,12 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -168,7 +168,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java index e732be71d..add71dc0a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java @@ -107,12 +107,12 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java index acb5c3a3a..20d28f1dc 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java @@ -107,12 +107,12 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java index b9704682a..edeebfb19 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java @@ -107,12 +107,12 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java index e448a9a34..8f76541fd 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java @@ -114,12 +114,12 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java index c89201783..564f55a25 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java @@ -110,12 +110,12 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -173,7 +173,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java index f5e95aaff..cc91dc01b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java @@ -107,12 +107,12 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java index 63150e31e..c20218350 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java @@ -107,12 +107,12 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java index 80d588f45..c0e419434 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java @@ -128,12 +128,12 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -191,7 +191,7 @@ public class TropicalFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java index 543d44e43..be23e372d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java @@ -116,12 +116,12 @@ public class TurtleController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -131,7 +131,7 @@ public class TurtleController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -179,7 +179,7 @@ public class TurtleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java index 8f95afed1..95443591e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java @@ -86,12 +86,12 @@ public class VexController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -101,7 +101,7 @@ public class VexController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -150,7 +150,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java index e6d9f389a..ed6333524 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java @@ -87,7 +87,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; List list = getOffers(entityhuman); if (list != null) { @@ -139,12 +139,12 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -154,7 +154,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -211,7 +211,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java index ce94c2095..fab6cb0ef 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java @@ -119,12 +119,12 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -134,7 +134,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -182,7 +182,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java index 078313838..79f755873 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java @@ -107,12 +107,12 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java index 618fa954a..206ab860e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java @@ -82,12 +82,12 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -97,7 +97,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -151,7 +151,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java index 65c9d2f49..96f1ef44a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java @@ -121,12 +121,12 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -184,7 +184,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java index 6f3aef41f..1ba581506 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java @@ -107,12 +107,12 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java index e5d4ccef9..8dc043a83 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java @@ -107,12 +107,12 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java index 12da701f4..b78d869d6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java @@ -107,12 +107,12 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect cs() { - return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.cs(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEffect d(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -122,7 +122,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect D() { - return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -170,7 +170,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index 81bafe6da..95942f904 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -995,8 +995,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).playerTick(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::playerTick; } @Override @@ -1887,7 +1887,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : IRegistry.SOUND_EVENT.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -1922,9 +1922,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData()); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java index 9b0d6cb1a..ef02e011f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java @@ -144,17 +144,17 @@ public class BatController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -163,7 +163,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java index 51928d79d..b1046e7f7 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java @@ -141,17 +141,17 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -159,7 +159,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java index 148db5841..1d623fbaa 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java @@ -179,17 +179,17 @@ public class CatController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -206,7 +206,7 @@ public class CatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java index 966d61b86..43dfac116 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java @@ -166,17 +166,17 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java index 0e061f380..1972ed0f5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java @@ -180,17 +180,17 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -207,7 +207,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java index 61a33849d..549eb8d0f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java @@ -186,17 +186,17 @@ public class CodController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -213,7 +213,7 @@ public class CodController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java index 1bab3775e..efc162904 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java @@ -194,17 +194,17 @@ public class CowController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -221,7 +221,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java index e2b8595e4..ff67a419f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java @@ -168,17 +168,17 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -195,7 +195,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java index c6647684b..86acb713b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java @@ -181,17 +181,17 @@ public class DolphinController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -208,7 +208,7 @@ public class DolphinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java index 1111b60fb..dad415824 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java @@ -165,17 +165,17 @@ public class DrownedController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class DrownedController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java index 4b11717bd..16fa3a533 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java @@ -140,17 +140,17 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -158,7 +158,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java index f59cb9a36..749140143 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java @@ -173,17 +173,17 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -200,7 +200,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java index e4470681f..90bc57432 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java @@ -165,17 +165,17 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java index 2fcdb20b3..743641fad 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java @@ -22,6 +22,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_14_R1.network.EmptyNetHandler; @@ -78,7 +79,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final Location packetLocationCache = new Location(null, 0, 0, 0); private PlayerlistTracker playerlistTracker; private final SkinPacketTracker skinTracker; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -231,7 +231,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public IChatBaseComponent getPlayerListName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new ChatComponentText(""); } return super.getPlayerListName(); @@ -253,12 +253,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -311,7 +311,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -440,9 +440,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable if (npc == null) return; this.noclip = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity()); boolean navigating = npc.getNavigator().isNavigating(); @@ -456,10 +453,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java index bd0f571b8..ecefb146d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java @@ -152,17 +152,17 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java index 6c6456cdd..5a0e7ee84 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java @@ -165,17 +165,17 @@ public class FoxController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class FoxController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java index 91d77fc24..62e2eb2fa 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java @@ -127,17 +127,17 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java index 37f875dda..069cde6cc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java @@ -151,17 +151,17 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java index fe802261e..94fdbf634 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java @@ -152,17 +152,17 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java index a771cbe23..52694bd24 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java @@ -152,17 +152,17 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java index 3b63fb449..e3bae5f4e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java @@ -198,17 +198,17 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -225,7 +225,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java index 15067a97c..6dcbd7289 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java @@ -197,17 +197,17 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -224,7 +224,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java index 7e551fe52..f4b926308 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java @@ -197,17 +197,17 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -224,7 +224,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java index d56073c0a..411dabd1b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java @@ -198,17 +198,17 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -225,7 +225,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java index 234b8935f..c61fd5f10 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java @@ -198,17 +198,17 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -225,7 +225,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java index b80c66bd6..353369940 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java @@ -152,17 +152,17 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java index 12f754baf..f3f331bb0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java @@ -151,17 +151,17 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java index f7eafcb04..45051b24b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java @@ -178,17 +178,17 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -205,7 +205,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java index 0777654ba..238ef83fa 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java @@ -157,17 +157,17 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -184,7 +184,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java index ab145078c..97e6bf1dc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java @@ -175,17 +175,17 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -202,7 +202,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java index 8bac3c567..04467e88a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java @@ -173,17 +173,17 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -200,7 +200,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java index ca2ddebce..32184b33b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java @@ -165,17 +165,17 @@ public class PandaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class PandaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java index 814178304..ed99eff9b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java @@ -138,17 +138,17 @@ public class ParrotController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -157,7 +157,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java index 1303514e9..3c880b1e4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java @@ -167,17 +167,17 @@ public class PhantomController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class PhantomController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java index 04d53a7dc..3db5a1432 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java @@ -173,17 +173,17 @@ public class PigController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -200,7 +200,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java index 6bf08b420..0742504fe 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java @@ -152,17 +152,17 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java index ee443c8c7..535310fef 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java @@ -165,17 +165,17 @@ public class PillagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class PillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java index d36e5d5a0..52c2c3fb1 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java @@ -141,17 +141,17 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -160,7 +160,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java index da2fd6f80..a2291cde1 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java @@ -184,17 +184,17 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -211,7 +211,7 @@ public class PufferFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java index 0a0ba5940..7d512bc80 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java @@ -173,17 +173,17 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -200,7 +200,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java index 1dfbab0fd..dba81ae63 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java @@ -165,17 +165,17 @@ public class RavagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class RavagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java index 43633e5c8..a20726a2d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java @@ -172,17 +172,17 @@ public class SalmonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -199,7 +199,7 @@ public class SalmonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java index 53de1203c..bc62101ac 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java @@ -165,17 +165,17 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -192,7 +192,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java index 900748f0a..6581d6794 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java @@ -152,17 +152,17 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java index 585b96052..e78ded6ae 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java @@ -149,17 +149,17 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -176,7 +176,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java index 26b705dcd..7d267f75f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java @@ -151,17 +151,17 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java index aeeba001b..2ff1f9c78 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java @@ -151,17 +151,17 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java index 7f9e22fa0..630ceb9d0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java @@ -151,17 +151,17 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java index 29fc42cf7..53f1b82e1 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java @@ -158,17 +158,17 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -185,7 +185,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java index 9263e6cbc..417f30a1b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java @@ -152,17 +152,17 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java index fd845c795..314a76176 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java @@ -151,17 +151,17 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java index dc12123e6..bb0e0b87a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java @@ -151,17 +151,17 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java index e495f36e6..b7f99d45a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java @@ -180,17 +180,17 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -207,7 +207,7 @@ public class TraderLlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java index f4a81b928..9ce5ee95e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java @@ -172,17 +172,17 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -199,7 +199,7 @@ public class TropicalFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java index daa54980d..24e19c914 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java @@ -160,17 +160,17 @@ public class TurtleController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -187,7 +187,7 @@ public class TurtleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java index a471a3bbe..c2e84ff6d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java @@ -130,17 +130,17 @@ public class VexController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java index 1072de5f8..e93d5f314 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java @@ -96,7 +96,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; List list = getOffers(); if (list != null) { @@ -199,17 +199,17 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -226,7 +226,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java index 37bdee846..e1879d2ed 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java @@ -166,17 +166,17 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -193,7 +193,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java index ac184e809..40eec0545 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java @@ -198,17 +198,17 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } public boolean isBlockingTrades() { @@ -229,7 +229,7 @@ public class WanderingTraderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java index e167de9f6..9a91604d4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java @@ -151,17 +151,17 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java index 15bc751f9..957a33694 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java @@ -132,17 +132,17 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -150,7 +150,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java index 5620df72d..2292c2c00 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java @@ -168,17 +168,17 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -195,7 +195,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java index 3604a71d7..7af0e1a67 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java @@ -151,17 +151,17 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java index 498676a99..de066937c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java @@ -151,17 +151,17 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java index e1eb8cda6..fbf6d5c38 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java @@ -151,17 +151,17 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override public SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index 40fba1b8c..1d9f051bb 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -1057,8 +1057,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).playerTick(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::playerTick; } @Override @@ -1989,7 +1989,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : IRegistry.SOUND_EVENT.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -2011,9 +2011,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData()); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java index cb53631ba..fb6a835e6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java @@ -129,17 +129,17 @@ public class BatController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -156,7 +156,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java index 464227b14..0e224ec4b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java @@ -126,17 +126,17 @@ public class BeeController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -153,7 +153,7 @@ public class BeeController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java index e15639a22..063be7108 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java @@ -126,17 +126,17 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -152,7 +152,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java index eeb4d05cc..8ab8964ba 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java @@ -165,17 +165,17 @@ public class CatController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -200,7 +200,7 @@ public class CatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java index 7d1c9de14..be78b7e4e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java @@ -152,17 +152,17 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -188,7 +188,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java index ca7a48e9e..632dbd10f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java @@ -166,17 +166,17 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -201,7 +201,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java index 1e28886fc..56b34609e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java @@ -176,17 +176,17 @@ public class CodController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -211,7 +211,7 @@ public class CodController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java index f62f4a98f..dc79e2094 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java @@ -180,17 +180,17 @@ public class CowController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -215,7 +215,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java index a66d833d1..350824f02 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java @@ -154,17 +154,17 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -189,7 +189,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java index 2ddcf7b28..e11aa0f7c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java @@ -171,17 +171,17 @@ public class DolphinController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -206,7 +206,7 @@ public class DolphinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java index 291a4b010..f16ba9f2f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java @@ -151,17 +151,17 @@ public class DrownedController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class DrownedController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java index e5336aedc..a7f969be0 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java @@ -125,17 +125,17 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -151,7 +151,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java index 418e10fe3..189d4514b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java @@ -159,17 +159,17 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java index c7358b8f7..6d5889383 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java @@ -151,17 +151,17 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java index 6025d1601..4e4442ce0 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_15_R1.CraftServer; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; @@ -22,6 +21,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_15_R1.network.EmptyNetHandler; @@ -78,7 +78,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final Location packetLocationCache = new Location(null, 0, 0, 0); private PlayerlistTracker playerlistTracker; private final SkinPacketTracker skinTracker; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -224,7 +223,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public IChatBaseComponent getPlayerListName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new ChatComponentText(""); } return super.getPlayerListName(); @@ -246,12 +245,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -312,7 +311,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -425,9 +424,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable if (npc == null) return; noclip = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity()); boolean navigating = npc.getNavigator().isNavigating(); @@ -449,16 +445,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } } - /* - double diff = this.yaw - this.aK; - if (diff != 40 && diff != -40) { - ++this.yawUpdateRequiredTicks; - } - if (this.yawUpdateRequiredTicks > 5) { - this.yaw = (diff > -40 && diff < 0) || (diff > 0 && diff > 40) ? this.aK - 40 : this.aK + 40; - this.yawUpdateRequiredTicks = 0; - } - */ } public void updateAI() { @@ -467,10 +453,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); @@ -547,12 +532,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } - @Override - public void setGameMode(GameMode mode) { - super.setGameMode(mode); - getHandle().noclip = mode == GameMode.SPECTATOR; - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java index be5472008..72014c34c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java @@ -146,17 +146,17 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java index 5649967e3..750b69bb5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java @@ -159,17 +159,17 @@ public class FoxController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class FoxController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java index 5350137a5..ebffa334a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java @@ -120,17 +120,17 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java index 00b8087b2..75bb1a26c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java @@ -145,17 +145,17 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java index 8d9084290..c69194316 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java @@ -146,17 +146,17 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java index 4c0877d71..ec1355360 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java @@ -146,17 +146,17 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java index a5610a33c..a211c179d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java @@ -192,17 +192,17 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -227,7 +227,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java index d444aef6d..2bcf6a4a2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java @@ -191,17 +191,17 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -226,7 +226,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java index 48780db21..0b4af74b5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java @@ -191,17 +191,17 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -226,7 +226,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java index 41506e06c..a7efed147 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java @@ -192,17 +192,17 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -227,7 +227,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java index 43c53023f..df67e7cb7 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java @@ -192,17 +192,17 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -227,7 +227,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java index 537d4b7a7..c7799f272 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java @@ -146,17 +146,17 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java index 372706b4c..69c818f78 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java @@ -145,17 +145,17 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java index 552178632..a5fa5ae92 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java @@ -172,17 +172,17 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -207,7 +207,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java index 99da9f3b9..2f920af08 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java @@ -155,17 +155,17 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -190,7 +190,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java index a6ccb2505..5481f8374 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java @@ -169,17 +169,17 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -204,7 +204,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java index 2350697a1..5799e9dd8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java @@ -161,17 +161,17 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -196,7 +196,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java index dfd3e08bb..fc360742d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java @@ -159,17 +159,17 @@ public class PandaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class PandaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java index 9f94d2715..a89f80052 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java @@ -131,17 +131,17 @@ public class ParrotController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -158,7 +158,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java index 20bd5dfe4..e69e86528 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java @@ -168,17 +168,17 @@ public class PhantomController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -203,7 +203,7 @@ public class PhantomController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java index 34a37432f..0737c7ec8 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java @@ -167,17 +167,17 @@ public class PigController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -202,7 +202,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java index 288b3d6f2..a8812e497 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java @@ -146,17 +146,17 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java index 07f65df87..c4fa757d1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java @@ -159,17 +159,17 @@ public class PillagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class PillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java index 853d63719..1ce6f88f2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java @@ -134,17 +134,17 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -161,7 +161,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java index 67812d73e..b39db4f0d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java @@ -182,17 +182,17 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -217,7 +217,7 @@ public class PufferFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java index 0d187b999..a241ab6fb 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java @@ -167,17 +167,17 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -202,7 +202,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java index 33d456706..be52e0bc1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java @@ -159,17 +159,17 @@ public class RavagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class RavagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java index 4b83c6ce8..2687ccb3c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java @@ -170,17 +170,17 @@ public class SalmonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -205,7 +205,7 @@ public class SalmonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java index 421c51932..1d754b7bd 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java @@ -159,17 +159,17 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java index f45317d87..a78430baa 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java @@ -146,17 +146,17 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java index 76c6107f6..f4296b90b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java @@ -143,17 +143,17 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java index f0e425b50..e8d956e0f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java @@ -145,17 +145,17 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java index 7c699fa64..4510de0fd 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java @@ -145,17 +145,17 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java index 86b3b6ffe..65118ae7f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java @@ -145,17 +145,17 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java index 43a3fadc0..a7053c7cf 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java @@ -156,17 +156,17 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -191,7 +191,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java index 3c1b33b57..865ae595a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java @@ -146,17 +146,17 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java index b9571eb87..2610cf5cc 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java @@ -145,17 +145,17 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java index 8352613a4..2af0dbb36 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java @@ -145,17 +145,17 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java index c60052d48..c9405059d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java @@ -174,17 +174,17 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -209,7 +209,7 @@ public class TraderLlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java index f771ecd41..2c9dc8246 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java @@ -170,17 +170,17 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -205,7 +205,7 @@ public class TropicalFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java index 004fd6bfc..a60939026 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java @@ -161,17 +161,17 @@ public class TurtleController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -196,7 +196,7 @@ public class TurtleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java index fd21356f8..f78f2a62e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java @@ -123,17 +123,17 @@ public class VexController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -150,7 +150,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java index 3eb0cc430..d7848be92 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java @@ -97,7 +97,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman, EnumHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; List list = getOffers(); if (list != null) { @@ -193,17 +193,17 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -228,7 +228,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java index bcf635973..9c60a6b58 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java @@ -160,17 +160,17 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -195,7 +195,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java index 05b863ced..db7671c40 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java @@ -190,17 +190,17 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -229,7 +229,7 @@ public class WanderingTraderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java index 49fa19b01..a53609068 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java @@ -144,17 +144,17 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java index f7e3d5888..6b9ea658a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java @@ -119,17 +119,17 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java index b5d3c404d..36dfc0889 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java @@ -162,17 +162,17 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -197,7 +197,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java index 37b9c718e..4870f4791 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java @@ -145,17 +145,17 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java index 02d4c17d7..5503abc53 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java @@ -145,17 +145,17 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java index ccfb95fad..c24a99dcb 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java @@ -145,17 +145,17 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override public SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 99c1e1466..19eb16084 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -1075,8 +1075,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).playerTick(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::playerTick; } @Override @@ -2033,7 +2033,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : IRegistry.SOUND_EVENT.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -2055,9 +2055,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData()); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java index e087da045..6cbd825cf 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java @@ -129,17 +129,17 @@ public class BatController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -156,7 +156,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 00b00a587..0346b89c4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java @@ -126,17 +126,17 @@ public class BeeController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -153,7 +153,7 @@ public class BeeController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java index 9b0e52b4a..4e176312d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java @@ -126,17 +126,17 @@ public class BlazeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -152,7 +152,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java index dec0d931c..10b6eaf8f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java @@ -165,17 +165,17 @@ public class CatController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -200,7 +200,7 @@ public class CatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index 958238053..a078fcb99 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java @@ -152,17 +152,17 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -188,7 +188,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java index ef1894214..ab354bd82 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java @@ -166,17 +166,17 @@ public class ChickenController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -201,7 +201,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java index 8508a0e24..0d36be29a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java @@ -177,17 +177,17 @@ public class CodController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -212,7 +212,7 @@ public class CodController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java index 5a3ac6f90..0e3a5bcf4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java @@ -181,17 +181,17 @@ public class CowController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -216,7 +216,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java index af4f276a4..2ad667c5c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java @@ -155,17 +155,17 @@ public class CreeperController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -190,7 +190,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java index 21b455616..ba183c31f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java @@ -171,17 +171,17 @@ public class DolphinController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -206,7 +206,7 @@ public class DolphinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java index 162f75595..6b3af62ee 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java @@ -151,17 +151,17 @@ public class DrownedController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class DrownedController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index b0c49cb44..f60721d83 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java @@ -125,17 +125,17 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -151,7 +151,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java index 625d9c7a5..ac8fc7510 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java @@ -159,17 +159,17 @@ public class EndermanController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java index 6da394b58..143a56ac4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java @@ -151,17 +151,17 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java index dea54a0b4..4ad137760 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_16_R3.CraftServer; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; @@ -27,6 +26,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_16_R3.network.EmptyNetHandler; @@ -86,7 +86,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final Location packetLocationCache = new Location(null, 0, 0, 0); private PlayerlistTracker playerlistTracker; private final SkinPacketTracker skinTracker; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -237,7 +236,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public IChatBaseComponent getPlayerListName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new ChatComponentText(""); } return super.getPlayerListName(); @@ -259,12 +258,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -342,7 +341,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean isCollidable() { return npc == null ? super.isCollidable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -455,9 +454,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable if (npc == null) return; noclip = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity()); boolean navigating = npc.getNavigator().isNavigating(); @@ -497,10 +493,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (EnumItemSlot slot : EnumItemSlot.values()) { ItemStack equipment = getEquipment(slot); @@ -579,12 +574,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } - @Override - public void setGameMode(GameMode mode) { - super.setGameMode(mode); - getHandle().noclip = mode == GameMode.SPECTATOR; - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java index 72c15e92b..5aa1b89ff 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java @@ -146,17 +146,17 @@ public class EvokerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java index c6cf46afc..ed9dacf0a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java @@ -159,17 +159,17 @@ public class FoxController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class FoxController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java index 64328d854..a9bc2ce3b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java @@ -120,17 +120,17 @@ public class GhastController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java index 603051e9f..7faceaf6d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java @@ -145,17 +145,17 @@ public class GiantController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java index ccfecaf32..cbf5c01a3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java @@ -146,17 +146,17 @@ public class GuardianController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java index 3936d6ede..477667b29 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java @@ -146,17 +146,17 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java index 427bbb118..77dddf14d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java @@ -145,17 +145,17 @@ public class HoglinController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class HoglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java index ffe6f6ad0..22ccd8c12 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java @@ -192,17 +192,17 @@ public class HorseController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -227,7 +227,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java index a490af697..60e28b7fa 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java @@ -190,17 +190,17 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -225,7 +225,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java index 1f043cf5e..499569fe5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java @@ -191,17 +191,17 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -226,7 +226,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java index 9d033d90a..31a7c4d37 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java @@ -192,17 +192,17 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -227,7 +227,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java index 7c0a8e318..af80a131c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java @@ -192,17 +192,17 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -227,7 +227,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java index 5dc247689..4e2ac8af3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java @@ -146,17 +146,17 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java index 9973c16e0..1ac759d4e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java @@ -145,17 +145,17 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java index 7d1375200..d4b6c8e01 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java @@ -172,17 +172,17 @@ public class LlamaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -207,7 +207,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java index 50bccf1e0..dafe16372 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java @@ -155,17 +155,17 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -190,7 +190,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java index 583e41f26..0a3258da7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java @@ -170,17 +170,17 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -205,7 +205,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java index a8dd5f5ed..c8a668f4e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java @@ -161,17 +161,17 @@ public class OcelotController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -196,7 +196,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java index c5d2c3b6e..c7890c346 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java @@ -159,17 +159,17 @@ public class PandaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class PandaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index f7552cad0..9c635c3e7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java @@ -132,17 +132,17 @@ public class ParrotController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -159,7 +159,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java index b19dcbc21..4dbda205e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java @@ -183,17 +183,17 @@ public class PhantomController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -218,7 +218,7 @@ public class PhantomController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java index 8f495c166..9e1986692 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java @@ -168,17 +168,17 @@ public class PigController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -203,7 +203,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java index 2203f577b..979992f6d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java @@ -146,17 +146,17 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java index 90d708e02..d219e1550 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java @@ -145,17 +145,17 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class PiglinBruteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java index 4fc782e8e..293b8b776 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java @@ -145,17 +145,17 @@ public class PiglinController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class PiglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java index 8eda0f6bf..9ef986a9d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java @@ -159,17 +159,17 @@ public class PillagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class PillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index 71f0a5c1b..996725ce8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java @@ -134,17 +134,17 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -161,7 +161,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java index 8d70ec98f..a9c06dfee 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java @@ -183,17 +183,17 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -218,7 +218,7 @@ public class PufferFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java index 70a0b493f..f5f45a9f7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java @@ -167,17 +167,17 @@ public class RabbitController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -202,7 +202,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java index 94cfeaa66..830b1a4c3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java @@ -159,17 +159,17 @@ public class RavagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class RavagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java index 8a68f839e..2f5408a75 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java @@ -171,17 +171,17 @@ public class SalmonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -206,7 +206,7 @@ public class SalmonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java index 7decf656b..0c8e73f6a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java @@ -159,17 +159,17 @@ public class SheepController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -194,7 +194,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java index b513a6dd1..d38463df9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java @@ -146,17 +146,17 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java index 7db4dbb91..9e7fa8020 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java @@ -143,17 +143,17 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java index c7995b06a..4f0329628 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java @@ -145,17 +145,17 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java index 93877dcb6..1c76f5467 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java @@ -145,17 +145,17 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java index 1999757ef..882e38e0e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java @@ -145,17 +145,17 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java index 56646bae7..844fefa94 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java @@ -156,17 +156,17 @@ public class SlimeController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -191,7 +191,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java index bc32b6330..e658db1cb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java @@ -146,17 +146,17 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java index 7b0bf1456..fa5b09a04 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java @@ -145,17 +145,17 @@ public class SpiderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java index 34d2ceced..e7798e733 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java @@ -145,17 +145,17 @@ public class SquidController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java index 5992b29a0..fb3826b51 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java @@ -145,17 +145,17 @@ public class StriderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class StriderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java index c67a7657e..6b17ac94d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java @@ -174,17 +174,17 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -209,7 +209,7 @@ public class TraderLlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java index a89f7b13a..aae7063fc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java @@ -171,17 +171,17 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -206,7 +206,7 @@ public class TropicalFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java index fbccf4fdf..74aed4517 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java @@ -161,17 +161,17 @@ public class TurtleController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -196,7 +196,7 @@ public class TurtleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index 6a45e4299..8da893538 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java @@ -123,17 +123,17 @@ public class VexController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -150,7 +150,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java index c6e7f88a6..8a66aa77e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java @@ -109,7 +109,7 @@ public class VillagerController extends MobEntityController { @Override public EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; List list = getOffers(); if (list != null) { @@ -195,17 +195,17 @@ public class VillagerController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -230,7 +230,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java index ae5eb2bbc..dd004d314 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java @@ -160,17 +160,17 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -195,7 +195,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java index b10decf38..0b2f74419 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java @@ -194,17 +194,17 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -233,7 +233,7 @@ public class WanderingTraderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java index 76a956445..bf9282812 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java @@ -145,17 +145,17 @@ public class WitchController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java index 313c04a58..ba4aaee87 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java @@ -119,17 +119,17 @@ public class WitherController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java index f1373b9d4..ea54acd0b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java @@ -162,17 +162,17 @@ public class WolfController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -197,7 +197,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java index 737ea4676..cf34fe369 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java @@ -145,17 +145,17 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZoglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java index 8a9f4ed3b..d46fce6a9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java @@ -145,17 +145,17 @@ public class ZombieController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java index b7e157ed1..0b5d58b29 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java @@ -145,17 +145,17 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override protected SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java index b9546bd49..aa89f6d47 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java @@ -145,17 +145,17 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEffect getSoundAmbient() { - return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundAmbient(), NPC.Metadata.AMBIENT_SOUND); } @Override public SoundEffect getSoundDeath() { - return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundDeath(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEffect getSoundHurt(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getSoundHurt(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -180,7 +180,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { unleash(true, false); // clearLeash with client update diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index 39fbd7dd3..1fd0705f1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -1093,8 +1093,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).playerTick(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::playerTick; } @Override @@ -2008,7 +2008,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : IRegistry.SOUND_EVENT.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -2030,9 +2030,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java index 32450ecdd..703d1b086 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java @@ -121,7 +121,7 @@ public class AxolotlController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -134,12 +134,12 @@ public class AxolotlController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -152,7 +152,7 @@ public class AxolotlController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java index 101b0cc72..74f1a08ea 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java @@ -101,7 +101,7 @@ public class BatController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -114,12 +114,12 @@ public class BatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -133,7 +133,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java index 54085469d..64a1c795d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java @@ -98,7 +98,7 @@ public class BeeController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -111,12 +111,12 @@ public class BeeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -130,7 +130,7 @@ public class BeeController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java index e72d51f27..fd5afa376 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java @@ -93,7 +93,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -106,12 +106,12 @@ public class BlazeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -124,7 +124,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java index c7bc09738..63c7eaff7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java @@ -114,7 +114,7 @@ public class CatController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -127,12 +127,12 @@ public class CatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class CatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java index 03210244b..5835a6c3b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java @@ -111,7 +111,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java index d69cf991e..04e144495 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java @@ -122,7 +122,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,12 +135,12 @@ public class ChickenController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -153,7 +153,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java index 5097e6f43..271ade7f7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java @@ -147,7 +147,7 @@ public class CodController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,12 +160,12 @@ public class CodController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -178,7 +178,7 @@ public class CodController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java index 625ae9413..20e5f8430 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java @@ -119,7 +119,7 @@ public class CowController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -132,12 +132,12 @@ public class CowController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -150,7 +150,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java index 17f4491be..e6cd690af 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java @@ -115,7 +115,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -128,12 +128,12 @@ public class CreeperController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java index 6dd1eb335..a7568d601 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java @@ -113,7 +113,7 @@ public class DolphinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class DolphinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class DolphinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java index 4ea632a78..d03390841 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java @@ -111,7 +111,7 @@ public class DrownedController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class DrownedController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class DrownedController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java index f9f830bcc..41df4f726 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java @@ -109,7 +109,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java index 15fce7e24..56c5401b2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java @@ -118,7 +118,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -131,12 +131,12 @@ public class EndermanController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java index 087f13978..41e768ffc 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java @@ -111,7 +111,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java index 814884747..ea362541b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer; @@ -27,6 +26,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_17_R1.network.EmptyNetHandler; @@ -87,7 +87,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable private PlayerlistTracker playerlistTracker; private final SkinPacketTracker skinTracker; private EmptyServerStatsCounter statsCache; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GameProfile gameProfile, NPC npc) { super(minecraftServer, world, gameProfile); @@ -237,12 +236,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } public PlayerMoveControl getMoveControl() { @@ -288,7 +287,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public Component getTabListDisplayName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new TextComponent(""); } return super.getTabListDisplayName(); @@ -375,7 +374,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public boolean isPushable() { return npc == null ? super.isPushable() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @@ -480,9 +479,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable if (npc == null) return; noPhysics = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - effectsDirty = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity()); updatePackets(npc.getNavigator().isNavigating()); @@ -505,10 +501,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + effectsDirty = true; boolean itemChanged = false; for (EquipmentSlot slot : EquipmentSlot.values()) { ItemStack equipment = getItemBySlot(slot); @@ -586,12 +581,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } - @Override - public void setGameMode(GameMode mode) { - super.setGameMode(mode); - getHandle().noPhysics = mode == GameMode.SPECTATOR; - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java index b474c2a10..7fe5e78d5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java @@ -105,7 +105,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class EvokerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java index 1790ed1f5..973c42f82 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java @@ -108,7 +108,7 @@ public class FoxController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class FoxController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class FoxController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java index c2b693261..4e59f8543 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java @@ -88,7 +88,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -101,12 +101,12 @@ public class GhastController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -124,7 +124,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java index d755ed39f..ae7b6465e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java @@ -105,7 +105,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class GiantController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java index f7b3b7376..896ef24be 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java @@ -105,7 +105,7 @@ public class GlowSquidController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class GlowSquidController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class GlowSquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java index a5f0dccad..00f1af566 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java @@ -108,7 +108,7 @@ public class GoatController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class GoatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class GoatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java index f340bee10..9252b3070 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java @@ -111,7 +111,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class GuardianController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java index 981e79bab..f0ae07fd1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java @@ -111,7 +111,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java index 60c0468c8..24d6c797d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java @@ -108,7 +108,7 @@ public class HoglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class HoglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class HoglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java index ead04657d..f2c01257c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java @@ -148,7 +148,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,12 +161,12 @@ public class HorseController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -187,7 +187,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java index c9661665a..8d1147213 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java @@ -147,7 +147,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,12 +160,12 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java index 792482a45..cd4d1dbe0 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java @@ -147,7 +147,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,12 +160,12 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java index 1e5e8b850..ec3afc0c3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java @@ -147,7 +147,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,12 +160,12 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java index f97277344..a2d3cc19b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java @@ -147,7 +147,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -160,12 +160,12 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -186,7 +186,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java index b0ee889e0..1b8c9c02b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java @@ -105,7 +105,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java index 6cc6a4f3e..0a139f28f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java @@ -105,7 +105,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java index 6df62dfcf..557a50e09 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java @@ -126,7 +126,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -139,12 +139,12 @@ public class LlamaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -157,7 +157,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java index f716c829d..25a4e90a7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java @@ -106,7 +106,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java index b87f36b82..e480a8107 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java @@ -111,7 +111,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java index 19e2e4960..b44721d01 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java @@ -114,7 +114,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -127,12 +127,12 @@ public class OcelotController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java index b3aa5f270..2a3eda29e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java @@ -108,7 +108,7 @@ public class PandaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class PandaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class PandaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java index 55edc8d6e..cf2b08527 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java @@ -97,7 +97,7 @@ public class ParrotController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -110,12 +110,12 @@ public class ParrotController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -129,7 +129,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java index 3e4ea79eb..60c18571f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java @@ -137,7 +137,7 @@ public class PhantomController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -150,12 +150,12 @@ public class PhantomController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -168,7 +168,7 @@ public class PhantomController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java index dd29b23aa..838304234 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java @@ -116,7 +116,7 @@ public class PigController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -129,12 +129,12 @@ public class PigController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -147,7 +147,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java index bd6ab740c..6c0ee2e6b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java @@ -106,7 +106,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java index e49b3ce7a..b2f545c1d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java @@ -108,7 +108,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class PiglinBruteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java index 3ff9af682..d1dd05551 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java @@ -108,7 +108,7 @@ public class PiglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class PiglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class PiglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java index 7f2c71b18..02cbb825c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java @@ -108,7 +108,7 @@ public class PillagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class PillagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class PillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java index 9648ed51c..e5ad510c7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java @@ -91,7 +91,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -104,12 +104,12 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java index 90767107a..82525abbe 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java @@ -142,7 +142,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -155,7 +155,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override @@ -168,7 +168,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -181,7 +181,7 @@ public class PufferFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java index 089e3faf3..d4b3e75b6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java @@ -113,7 +113,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class RabbitController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java index acfeb96c0..9a2fe0b28 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java @@ -108,7 +108,7 @@ public class RavagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class RavagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class RavagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java index 711f75b69..151543bd6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java @@ -139,7 +139,7 @@ public class SalmonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -152,12 +152,12 @@ public class SalmonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -170,7 +170,7 @@ public class SalmonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java index 472f52a89..d753799ad 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java @@ -108,7 +108,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class SheepController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java index 35acfd12a..37560f82c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java @@ -109,7 +109,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java index 0d73db262..096b09916 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java @@ -103,7 +103,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -116,12 +116,12 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -134,7 +134,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java index ea612193d..90d9bfb9c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java @@ -105,7 +105,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java index 22265ca69..8cb1d8624 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java @@ -105,7 +105,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java index 3bf6993fb..a51e0b399 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java @@ -105,7 +105,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java index 64907dbbc..8c0c097c2 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java @@ -106,7 +106,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class SlimeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java index 520cac0d0..8bc05edf4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java @@ -118,7 +118,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -131,12 +131,12 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java index 2454cfc7a..7b70d6581 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java @@ -105,7 +105,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class SpiderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java index 87d411d1a..cb3ff0921 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java @@ -105,7 +105,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class SquidController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java index 697ef1c2b..e19217825 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java @@ -105,7 +105,7 @@ public class StriderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class StriderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class StriderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java index e1f1eeac3..e929878e0 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java @@ -126,7 +126,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -139,12 +139,12 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -157,7 +157,7 @@ public class TraderLlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java index f671e19f4..efe918b4a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java @@ -141,7 +141,7 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -154,12 +154,12 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -172,7 +172,7 @@ public class TropicalFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java index a1707fa8b..f547e132c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java @@ -127,7 +127,7 @@ public class TurtleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -140,12 +140,12 @@ public class TurtleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -158,7 +158,7 @@ public class TurtleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java index c58dd75ea..8d60408b7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java @@ -91,7 +91,7 @@ public class VexController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -104,12 +104,12 @@ public class VexController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -123,7 +123,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java index 055195840..d5234c3ae 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java @@ -122,7 +122,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,12 +135,12 @@ public class VillagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -153,7 +153,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update @@ -182,7 +182,7 @@ public class VillagerController extends MobEntityController { @Override public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; MerchantOffers list = getOffers(); if (list != null) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java index 7cc983d06..1088e96e1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java @@ -108,7 +108,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java index 0a6752db6..a9ab6e466 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java @@ -120,7 +120,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -133,12 +133,12 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -155,7 +155,7 @@ public class WanderingTraderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java index 434c514a3..0e295f8ed 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java @@ -105,7 +105,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class WitchController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java index 64b3aeae0..148e5f544 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java @@ -97,7 +97,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -110,12 +110,12 @@ public class WitherController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -128,7 +128,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java index f4b6c579b..f342939e3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java @@ -110,7 +110,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class WolfController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -141,7 +141,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java index 79f36acf4..4781c0a62 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java @@ -107,7 +107,7 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -138,7 +138,7 @@ public class ZoglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java index 9633dcaf8..d06247ec3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java @@ -105,7 +105,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class ZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java index 34885efd8..614a26e12 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java @@ -105,7 +105,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java index f61af0da5..dfc3f0da6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java @@ -105,7 +105,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -136,7 +136,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java index 826774510..2a6db2281 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java @@ -53,7 +53,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker { protected void setBlockDamage(int modifiedDamage) { ((ServerLevel) getHandle().level).destroyBlockProgress(getHandle().getId(), new BlockPos(x, y, z), modifiedDamage); - // TODO: check this works } private float strengthMod(BlockState block) { diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index f9c0aa0c9..66778706a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -1097,8 +1097,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((ServerPlayer) getHandle(entity)).doTick(); + public Runnable playerTicker(Player entity) { + return ((ServerPlayer) getHandle(entity))::doTick; } @Override @@ -2008,7 +2008,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, String meta) { + public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : Registry.SOUND_EVENT .get(new ResourceLocation(npc.data().get(meta, snd == null ? "" : snd.toString()))); @@ -2027,9 +2027,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.setCustomDisplay(mat != null); if (mat != null) { minecart.setDisplayBlockState(Registry.BLOCK.byId(mat.getId()).defaultBlockState()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java index bdd648b71..f663919a5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java @@ -121,7 +121,7 @@ public class AxolotlController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -134,12 +134,12 @@ public class AxolotlController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -152,7 +152,7 @@ public class AxolotlController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java index 2211ac791..90773d61b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java @@ -103,7 +103,7 @@ public class BatController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -116,12 +116,12 @@ public class BatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class BatController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java index 27f0ac148..f1a65adb1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java @@ -100,7 +100,7 @@ public class BeeController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -113,12 +113,12 @@ public class BeeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -132,7 +132,7 @@ public class BeeController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java index 8b3536589..2034a506f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java @@ -95,7 +95,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -108,12 +108,12 @@ public class BlazeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java index c25c12aa0..3becb2b56 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java @@ -115,7 +115,7 @@ public class CatController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -128,12 +128,12 @@ public class CatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class CatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java index baf88db74..dfd46b9eb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java @@ -112,7 +112,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -144,7 +144,7 @@ public class CaveSpiderController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.isLeashed(); } if (super.isLeashed()) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java index bdfe485fb..d203515d3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java @@ -123,7 +123,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -136,12 +136,12 @@ public class ChickenController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -154,7 +154,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java index 7a40da32b..b5fcb7c91 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java @@ -148,7 +148,7 @@ public class CodController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,12 +161,12 @@ public class CodController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -179,7 +179,7 @@ public class CodController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java index 55d832ef0..71f53c5fd 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java @@ -120,7 +120,7 @@ public class CowController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -133,12 +133,12 @@ public class CowController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -151,7 +151,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java index 21fa0b588..31ca1f04d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java @@ -115,7 +115,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -128,12 +128,12 @@ public class CreeperController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java index dd377d1e9..65c3d978c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java @@ -113,7 +113,7 @@ public class DolphinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class DolphinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -149,7 +149,7 @@ public class DolphinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java index e3da1f293..1cbf1986f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java @@ -112,7 +112,7 @@ public class DrownedController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class DrownedController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class DrownedController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java index 81a0503e5..c81d41625 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java @@ -111,7 +111,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java index d2d043198..a553b8a07 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java @@ -115,7 +115,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -128,12 +128,12 @@ public class EndermanController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java index ab56a15bc..9407caf87 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java @@ -112,7 +112,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java index ad64b6f75..6b9f2cfd3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_18_R2.CraftServer; import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer; @@ -28,6 +27,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_18_R2.network.EmptyNetHandler; @@ -88,7 +88,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable private PlayerlistTracker playerlistTracker; private final SkinPacketTracker skinTracker; private EmptyServerStatsCounter statsCache; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GameProfile gameProfile, NPC npc) { super(minecraftServer, world, gameProfile); @@ -238,12 +237,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } public PlayerMoveControl getMoveControl() { @@ -289,7 +288,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public Component getTabListDisplayName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return new TextComponent(""); } return super.getTabListDisplayName(); @@ -376,7 +375,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public boolean isPushable() { - return npc == null ? super.isPushable() : npc.data(). get(NPC.COLLIDABLE_METADATA, !npc.isProtected()); + return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } private void moveOnCurrentHeading() { @@ -480,9 +479,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable if (npc == null) return; noPhysics = isSpectator(); - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - effectsDirty = true; - } Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity()); updatePackets(npc.getNavigator().isNavigating()); @@ -504,10 +500,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + effectsDirty = true; boolean itemChanged = false; for (EquipmentSlot slot : EquipmentSlot.values()) { ItemStack equipment = getItemBySlot(slot); @@ -592,12 +587,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } - @Override - public void setGameMode(GameMode mode) { - super.setGameMode(mode); - getHandle().noPhysics = mode == GameMode.SPECTATOR; - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java index 2a10c145a..a63b5b714 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java @@ -106,7 +106,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class EvokerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class EvokerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java index 2f0c5f066..d6d168570 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java @@ -109,7 +109,7 @@ public class FoxController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class FoxController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class FoxController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java index 57f8337b9..6200cbf96 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java @@ -90,7 +90,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -103,12 +103,12 @@ public class GhastController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -126,7 +126,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java index 612f2f33f..33b8e27d4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java @@ -106,7 +106,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class GiantController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java index a23452d7b..3b7095485 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java @@ -106,7 +106,7 @@ public class GlowSquidController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class GlowSquidController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class GlowSquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java index c1b5ba57b..1b2c446f9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java @@ -109,7 +109,7 @@ public class GoatController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class GoatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class GoatController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java index 3e7854be2..b39fdaecc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java @@ -112,7 +112,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class GuardianController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java index e4eff442d..d29b195f0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java @@ -112,7 +112,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class GuardianElderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java index adc9f7c32..82d1053d5 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java @@ -109,7 +109,7 @@ public class HoglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class HoglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class HoglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java index b0f20a5c7..0ae6e31ec 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java @@ -149,7 +149,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -162,12 +162,12 @@ public class HorseController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -188,7 +188,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java index e0a78acff..c395fc86e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java @@ -148,7 +148,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,12 +161,12 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -187,7 +187,7 @@ public class HorseDonkeyController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java index 8a555a849..2a34a5da2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java @@ -148,7 +148,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,12 +161,12 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -187,7 +187,7 @@ public class HorseMuleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java index 6b2da7770..ac17b1632 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java @@ -148,7 +148,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,12 +161,12 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -187,7 +187,7 @@ public class HorseSkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java index dfe3a2a10..9a955efb3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java @@ -148,7 +148,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -161,12 +161,12 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -187,7 +187,7 @@ public class HorseZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java index 00f7f0b6b..253e3085f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java @@ -62,7 +62,7 @@ public class HumanController extends AbstractEntityController { if (getBukkitEntity() == null || !getBukkitEntity().isValid() || getBukkitEntity() != handle.getBukkitEntity()) return; - boolean removeFromPlayerList = npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, + boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList); } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java index 138087c3a..37c87e762 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java @@ -106,7 +106,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class IllusionerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java index eabd14cbb..6b518bf84 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java @@ -106,7 +106,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java index 116e7a608..2a411470b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java @@ -127,7 +127,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -140,12 +140,12 @@ public class LlamaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -158,7 +158,7 @@ public class LlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java index b2a82d9ad..1068a8e7a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java @@ -107,7 +107,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -138,7 +138,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java index 846ea6ea7..975caf5b3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java @@ -112,7 +112,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -143,7 +143,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java index 82009443e..7e6708669 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java @@ -115,7 +115,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -128,12 +128,12 @@ public class OcelotController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -146,7 +146,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java index 3ada23a15..91bf33388 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java @@ -109,7 +109,7 @@ public class PandaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class PandaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class PandaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java index 1db6d19e4..3f49b3dd4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java @@ -99,7 +99,7 @@ public class ParrotController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -112,12 +112,12 @@ public class ParrotController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -131,7 +131,7 @@ public class ParrotController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java index 712b6cfe8..a8af865f6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java @@ -138,7 +138,7 @@ public class PhantomController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -151,12 +151,12 @@ public class PhantomController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -169,7 +169,7 @@ public class PhantomController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java index ecd97b9f4..ade965c6d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java @@ -116,7 +116,7 @@ public class PigController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -129,12 +129,12 @@ public class PigController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -147,7 +147,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java index d67f09915..77b6c1665 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java @@ -107,7 +107,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -138,7 +138,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java index 346335345..3b7379321 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java @@ -109,7 +109,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class PiglinBruteController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java index a222cea07..0fa37a7c4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java @@ -109,7 +109,7 @@ public class PiglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class PiglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class PiglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java index 81992bb2a..c5a2b0416 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java @@ -109,7 +109,7 @@ public class PillagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class PillagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class PillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java index d72811007..77edaf72d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java @@ -93,7 +93,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -106,12 +106,12 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class PolarBearController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java index f6720abea..e2c084a4b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java @@ -143,7 +143,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,7 +156,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override @@ -169,7 +169,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -182,7 +182,7 @@ public class PufferFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java index caf735b62..0ac6154a1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java @@ -114,7 +114,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -127,12 +127,12 @@ public class RabbitController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -150,7 +150,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java index f5ce3da22..706d5e0f3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java @@ -114,7 +114,7 @@ public class RavagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -127,12 +127,12 @@ public class RavagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -145,7 +145,7 @@ public class RavagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java index a07f81ed6..b50846ac2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java @@ -140,7 +140,7 @@ public class SalmonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -153,12 +153,12 @@ public class SalmonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -171,7 +171,7 @@ public class SalmonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java index f3d027a7a..7cfb15779 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java @@ -109,7 +109,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class SheepController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java index 5d2042753..45dc689f0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java @@ -110,7 +110,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -141,7 +141,7 @@ public class ShulkerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java index 24d33581a..68e9e472c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java @@ -104,7 +104,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -117,12 +117,12 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -135,7 +135,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java index 8739755d6..a9b99217a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java @@ -106,7 +106,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java index 484f265ef..23e40e7c2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java @@ -106,7 +106,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class SkeletonStrayController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java index 116dfc42c..8461bb24e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java @@ -106,7 +106,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class SkeletonWitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java index 4c021e91d..5e1c082ef 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java @@ -107,7 +107,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class SlimeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -138,7 +138,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java index 7f59cc8ee..5dbdfc02a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java @@ -119,7 +119,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -132,12 +132,12 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -150,7 +150,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java index 15fc773db..9feb2c9c7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java @@ -106,7 +106,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class SpiderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java index 3fd93f72a..897ee2b9b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java @@ -106,7 +106,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class SquidController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java index 91e145a9b..7a71b257a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java @@ -106,7 +106,7 @@ public class StriderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class StriderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class StriderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java index 3a20dddb4..037022594 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java @@ -128,7 +128,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -141,12 +141,12 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -159,7 +159,7 @@ public class TraderLlamaController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java index 85e4d5f01..04e08383c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java @@ -142,7 +142,7 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -155,12 +155,12 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -173,7 +173,7 @@ public class TropicalFishController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java index 5f6ef89c6..5f9a3c1d6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java @@ -128,7 +128,7 @@ public class TurtleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -141,12 +141,12 @@ public class TurtleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -159,7 +159,7 @@ public class TurtleController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java index 8060532e0..973f0c567 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java @@ -93,7 +93,7 @@ public class VexController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -106,12 +106,12 @@ public class VexController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -125,7 +125,7 @@ public class VexController extends MobEntityController { return super.isLeashed(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java index 565e80a92..f29548e1e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java @@ -122,7 +122,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,12 +135,12 @@ public class VillagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -153,7 +153,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update @@ -182,7 +182,7 @@ public class VillagerController extends MobEntityController { @Override public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; MerchantOffers list = getOffers(); if (list != null) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java index 0a7a0921d..9d218cfc6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java @@ -109,7 +109,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -140,7 +140,7 @@ public class VindicatorController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java index 43a335f54..1383fd89d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java @@ -118,7 +118,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -131,12 +131,12 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -153,7 +153,7 @@ public class WanderingTraderController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java index 9dc2944c6..a8dff6fec 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java @@ -106,7 +106,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class WitchController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java index 45d903e76..c6c9c2c5f 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java @@ -99,7 +99,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -112,12 +112,12 @@ public class WitherController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -130,7 +130,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java index 6dd77dd5f..250530c46 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java @@ -111,7 +111,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class WolfController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -142,7 +142,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java index a9516ff12..7764e1d76 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java @@ -108,7 +108,7 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -139,7 +139,7 @@ public class ZoglinController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java index e61db73c6..3c73201c1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java @@ -106,7 +106,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class ZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java index df8b65625..d70082deb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java @@ -106,7 +106,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class ZombieHuskController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java index 49287ab6b..2781235f4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java @@ -106,7 +106,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -119,12 +119,12 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -137,7 +137,7 @@ public class ZombieVillagerController extends MobEntityController { if (npc == null) return super.isLeashed(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.isLeashed(); if (super.isLeashed()) { dropLeash(true, false); // clearLeash with client update diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java index 16c964ad6..bd470dda7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java @@ -53,7 +53,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker { protected void setBlockDamage(int modifiedDamage) { ((ServerLevel) getHandle().level).destroyBlockProgress(getHandle().getId(), new BlockPos(x, y, z), modifiedDamage); - // TODO: check this works } private float strengthMod(BlockState block) { diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index c3617db12..cd9a6cc43 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -1105,8 +1105,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((ServerPlayer) getHandle(entity)).doTick(); + public Runnable playerTicker(Player entity) { + return ((ServerPlayer) getHandle(entity))::doTick; } @Override @@ -1481,7 +1481,7 @@ public class NMSImpl implements NMSBridge { throw new ReportedException(crashreport); } } - boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, + boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); if (!entity.isAlive()) { ((ServerLevel) entity.level).getChunkSource().removeEntity(entity); @@ -2016,7 +2016,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, String meta) { + public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : Registry.SOUND_EVENT .get(new ResourceLocation(npc.data().get(meta, snd == null ? "" : snd.toString()))); @@ -2035,9 +2035,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, ""), false); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, ""), false); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.setCustomDisplay(mat != null); if (mat != null) { minecart.setDisplayBlockState(Registry.BLOCK.byId(mat.getId()).defaultBlockState()); diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java index b8028265f..1016932f4 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java @@ -122,7 +122,7 @@ public class AllayController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,12 +135,12 @@ public class AllayController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java index 3e2b00cd1..47a3ad6b8 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java @@ -122,7 +122,7 @@ public class AxolotlController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,12 +135,12 @@ public class AxolotlController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java index cd179bfb5..49a7a2eb5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java @@ -103,7 +103,7 @@ public class BatController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -116,12 +116,12 @@ public class BatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java index 6f656555f..9d186990e 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java @@ -100,7 +100,7 @@ public class BeeController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -113,12 +113,12 @@ public class BeeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java index 9738e9d70..3cfabb8cc 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java @@ -95,7 +95,7 @@ public class BlazeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -108,12 +108,12 @@ public class BlazeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java index d198f3f96..82ad321cd 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CamelController.java @@ -133,7 +133,7 @@ public class CamelController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -146,12 +146,12 @@ public class CamelController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java index 9ad1946dc..e74cc9ee5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java @@ -116,7 +116,7 @@ public class CatController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -129,12 +129,12 @@ public class CatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java index d0962e112..f2bd993e9 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java @@ -113,7 +113,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java index 38e2b4c7c..91b7f1d39 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java @@ -124,7 +124,7 @@ public class ChickenController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -137,12 +137,12 @@ public class ChickenController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java index 60213b12e..b9faaaec3 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java @@ -149,7 +149,7 @@ public class CodController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -162,12 +162,12 @@ public class CodController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java index acd262ab6..867782f23 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java @@ -121,7 +121,7 @@ public class CowController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -134,12 +134,12 @@ public class CowController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java index 713212c5f..310162060 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java @@ -116,7 +116,7 @@ public class CreeperController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -129,12 +129,12 @@ public class CreeperController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java index 0be673a52..d3e944c6a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java @@ -114,7 +114,7 @@ public class DolphinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -127,12 +127,12 @@ public class DolphinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java index 62166e44f..83c443446 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java @@ -113,7 +113,7 @@ public class DrownedController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class DrownedController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java index 2d9f91707..c11190891 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java @@ -111,7 +111,7 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class EnderDragonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java index 76976f95f..ceba7673f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java @@ -116,7 +116,7 @@ public class EndermanController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -129,12 +129,12 @@ public class EndermanController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java index fe82ef712..be29c109a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java @@ -113,7 +113,7 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class EndermiteController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java index 1a253e578..5c0d0cf46 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.function.Consumer; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_19_R2.CraftServer; import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; @@ -29,6 +28,7 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_19_R2.network.EmptyNetHandler; @@ -94,7 +94,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable private boolean setBukkitEntity; private final SkinPacketTracker skinTracker; private EmptyServerStatsCounter statsCache; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GameProfile gameProfile, NPC npc) { super(minecraftServer, world, gameProfile); @@ -246,12 +245,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } public PlayerMoveControl getMoveControl() { @@ -297,7 +296,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public Component getTabListDisplayName() { - if (npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean())) { + if (Setting.DISABLE_TABLIST.asBoolean()) { return MutableComponent.create(new LiteralContents("")); } return super.getTabListDisplayName(); @@ -384,7 +383,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable @Override public boolean isPushable() { - return npc == null ? super.isPushable() : npc.data(). get(NPC.COLLIDABLE_METADATA, !npc.isProtected()); + return npc == null ? super.isPushable() : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); } @Override @@ -497,10 +496,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable super.tick(); if (npc == null) return; - - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - effectsDirty = true; - } + noPhysics = isSpectator(); Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", getBukkitEntity()); updatePackets(npc.getNavigator().isNavigating()); @@ -532,10 +528,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + effectsDirty = true; boolean itemChanged = false; for (EquipmentSlot slot : EquipmentSlot.values()) { ItemStack equipment = getItemBySlot(slot); @@ -617,12 +612,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable ((CraftServer) Bukkit.getServer()).getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } - @Override - public void setGameMode(GameMode mode) { - super.setGameMode(mode); - getHandle().noPhysics = mode == GameMode.SPECTATOR; - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { ((CraftServer) Bukkit.getServer()).getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java index 34723f6ff..904c90eab 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java @@ -107,7 +107,7 @@ public class EvokerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class EvokerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java index 28b0e3e22..6a03d6161 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java @@ -110,7 +110,7 @@ public class FoxController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class FoxController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java index 935315aae..70aa17649 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java @@ -113,7 +113,7 @@ public class FrogController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class FrogController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java index 3c2895122..dedf7ee0b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java @@ -90,7 +90,7 @@ public class GhastController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -103,12 +103,12 @@ public class GhastController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java index 7d292ceef..28fe8dad1 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java @@ -107,7 +107,7 @@ public class GiantController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class GiantController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java index ee32d21e1..e076f55ab 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java @@ -107,7 +107,7 @@ public class GlowSquidController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class GlowSquidController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java index 601159ae0..b4fb2e102 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java @@ -110,7 +110,7 @@ public class GoatController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class GoatController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java index 76024e98b..1cd2db7a5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java @@ -113,7 +113,7 @@ public class GuardianController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class GuardianController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java index e8959cfdd..27b2bac61 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java @@ -113,7 +113,7 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class GuardianElderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java index c89757865..b25b619e4 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java @@ -113,7 +113,7 @@ public class HoglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class HoglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java index 825f29221..405cd4637 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java @@ -144,7 +144,7 @@ public class HorseController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -157,12 +157,12 @@ public class HorseController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java index 7bccc8471..350f3e682 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java @@ -143,7 +143,7 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,12 +156,12 @@ public class HorseDonkeyController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java index a6d2c0080..3c123ddb4 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java @@ -143,7 +143,7 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,12 +156,12 @@ public class HorseMuleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java index 7ae27aa99..1817e3a40 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java @@ -143,7 +143,7 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,12 +156,12 @@ public class HorseSkeletonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java index e9eff67bd..23e7b9ea7 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java @@ -143,7 +143,7 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,12 +156,12 @@ public class HorseZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java index 752613e2f..325d12373 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java @@ -62,7 +62,7 @@ public class HumanController extends AbstractEntityController { if (getBukkitEntity() == null || !getBukkitEntity().isValid() || getBukkitEntity() != handle.getBukkitEntity()) return; - boolean removeFromPlayerList = npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, + boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList); } diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java index 42ca7e985..3d70617f2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java @@ -107,7 +107,7 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class IllusionerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java index 1744a2280..cb39ed528 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java @@ -107,7 +107,7 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class IronGolemController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java index ba9913a14..66fa870da 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java @@ -128,7 +128,7 @@ public class LlamaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -141,12 +141,12 @@ public class LlamaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java index 3464954e3..6e38f192b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java @@ -108,7 +108,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java index 47ad98c79..047e5f043 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java @@ -113,7 +113,7 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -126,12 +126,12 @@ public class MushroomCowController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java index 7698dc751..ba0abc71d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java @@ -116,7 +116,7 @@ public class OcelotController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -129,12 +129,12 @@ public class OcelotController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java index bb99d4507..673f2284f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java @@ -110,7 +110,7 @@ public class PandaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class PandaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java index 44508a1c5..9a5d8692d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java @@ -99,7 +99,7 @@ public class ParrotController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -112,12 +112,12 @@ public class ParrotController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java index 610584e00..f8ceb0e9e 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java @@ -138,7 +138,7 @@ public class PhantomController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -151,12 +151,12 @@ public class PhantomController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java index 87f7c204e..7c0e3fb46 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java @@ -111,7 +111,7 @@ public class PigController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class PigController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java index 45c6c32ef..3264b8e37 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java @@ -108,7 +108,7 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class PigZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java index 170433ce4..e4c41d7b6 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java @@ -110,7 +110,7 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class PiglinBruteController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java index 4e133bb9b..ca8613239 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java @@ -110,7 +110,7 @@ public class PiglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class PiglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java index 367aa3f9f..1f93d6e58 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java @@ -110,7 +110,7 @@ public class PillagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class PillagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java index 9f08413f4..7245c6970 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java @@ -93,7 +93,7 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -106,12 +106,12 @@ public class PolarBearController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java index 7da17d8fe..e170d47c2 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java @@ -144,7 +144,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -157,7 +157,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override @@ -170,7 +170,7 @@ public class PufferFishController extends MobEntityController { @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java index 1c68d8651..9a064cded 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java @@ -115,7 +115,7 @@ public class RabbitController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -128,12 +128,12 @@ public class RabbitController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java index 694401590..f85582f77 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java @@ -110,7 +110,7 @@ public class RavagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class RavagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java index 9cf4f7fbd..2ccd06da0 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java @@ -141,7 +141,7 @@ public class SalmonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -154,12 +154,12 @@ public class SalmonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java index 452da9d17..397547800 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java @@ -110,7 +110,7 @@ public class SheepController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class SheepController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java index fc8341005..ccc693fb5 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java @@ -111,7 +111,7 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -124,12 +124,12 @@ public class ShulkerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java index 16e284652..a84cb96c6 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java @@ -105,7 +105,7 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -118,12 +118,12 @@ public class SilverfishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java index 3eeb160f2..abf00fb73 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java @@ -107,7 +107,7 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class SkeletonController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java index 4c741aeef..87b0c16ff 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java @@ -107,7 +107,7 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class SkeletonStrayController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java index a3e5832a7..f1b9fc2ea 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java @@ -107,7 +107,7 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class SkeletonWitherController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java index a3dcb0a98..4f8a6be44 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java @@ -108,7 +108,7 @@ public class SlimeController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -121,12 +121,12 @@ public class SlimeController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java index 1ce173eea..de17e3675 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java @@ -120,7 +120,7 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -133,12 +133,12 @@ public class SnowmanController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java index 34cfa4515..f022ac03f 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java @@ -107,7 +107,7 @@ public class SpiderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class SpiderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java index ba5d403ba..cfc8806bb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java @@ -107,7 +107,7 @@ public class SquidController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class SquidController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java index 244c58f99..1c371bef7 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java @@ -107,7 +107,7 @@ public class StriderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class StriderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java index 151f95750..9b6e43f4b 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java @@ -141,7 +141,7 @@ public class TadpoleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -154,12 +154,12 @@ public class TadpoleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java index 3e6fc2612..85d04ea5d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java @@ -129,7 +129,7 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -142,12 +142,12 @@ public class TraderLlamaController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java index 04f744291..d38b5f827 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java @@ -143,7 +143,7 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -156,12 +156,12 @@ public class TropicalFishController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java index 20895db27..a603e0f1e 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java @@ -128,7 +128,7 @@ public class TurtleController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -141,12 +141,12 @@ public class TurtleController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java index a186244a0..2b9aaca59 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java @@ -93,7 +93,7 @@ public class VexController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -106,12 +106,12 @@ public class VexController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java index a93e27855..e15deab92 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java @@ -122,7 +122,7 @@ public class VillagerController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -135,12 +135,12 @@ public class VillagerController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override @@ -174,7 +174,7 @@ public class VillagerController extends MobEntityController { @Override public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; MerchantOffers list = getOffers(); if (list != null) { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java index 731063c0b..b7bea27eb 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java @@ -110,7 +110,7 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -123,12 +123,12 @@ public class VindicatorController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java index a956e9616..07143e771 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java @@ -119,7 +119,7 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -132,12 +132,12 @@ public class WanderingTraderController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java index 0ea93b7f1..d8c65232d 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java @@ -117,7 +117,7 @@ public class WardenController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -130,12 +130,12 @@ public class WardenController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java index b973e96fb..66357fa29 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java @@ -107,7 +107,7 @@ public class WitchController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class WitchController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java index 0deabbdcb..cac314260 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java @@ -99,7 +99,7 @@ public class WitherController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -112,12 +112,12 @@ public class WitherController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java index 5b2f170d9..0180d50c3 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java @@ -112,7 +112,7 @@ public class WolfController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -125,12 +125,12 @@ public class WolfController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java index 4913627df..78063101c 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java @@ -109,7 +109,7 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -122,12 +122,12 @@ public class ZoglinController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java index c3f5d0ff8..03b49e973 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java @@ -107,7 +107,7 @@ public class ZombieController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class ZombieController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java index 8a215120d..2492c29e3 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java @@ -107,7 +107,7 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class ZombieHuskController extends MobEntityController { @Override protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java index 1af65c656..56b214a9a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java @@ -107,7 +107,7 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); } @Override @@ -120,12 +120,12 @@ public class ZombieVillagerController extends MobEntityController { @Override public SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); } @Override public SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } @Override diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java index 04a8f8f47..694457353 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java @@ -53,7 +53,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker { protected void setBlockDamage(int modifiedDamage) { ((ServerLevel) getHandle().level).destroyBlockProgress(getHandle().getId(), new BlockPos(x, y, z), modifiedDamage); - // TODO: check this works } private float strengthMod(BlockState block) { diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java index f32a8a6f2..670d522be 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java @@ -1102,8 +1102,8 @@ public class NMSImpl implements NMSBridge { if (Setting.DISABLE_TABLIST.asBoolean() != data.listed()) { list.set(i, new ClientboundPlayerInfoUpdatePacket.Entry(data.profileId(), data.profile(), - Setting.DISABLE_TABLIST.asBoolean(), data.latency(), data.gameMode(), - Setting.DISABLE_TABLIST.asBoolean() ? data.displayName() : Component.empty(), + !Setting.DISABLE_TABLIST.asBoolean(), data.latency(), data.gameMode(), + !Setting.DISABLE_TABLIST.asBoolean() ? data.displayName() : Component.empty(), data.chatSession())); changed = true; } @@ -1185,8 +1185,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((ServerPlayer) getHandle(entity)).doTick(); + public Runnable playerTicker(Player entity) { + return ((ServerPlayer) getHandle(entity))::doTick; } @Override @@ -1611,7 +1611,7 @@ public class NMSImpl implements NMSBridge { throw new ReportedException(crashreport); } } - boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, + boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); if (!entity.isAlive()) { ((ServerLevel) entity.level).getChunkSource().removeEntity(entity); @@ -2146,7 +2146,7 @@ public class NMSImpl implements NMSBridge { return null; } - public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, String meta) { + public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : BuiltInRegistries.SOUND_EVENT .get(new ResourceLocation(npc.data().get(meta, snd == null ? "" : snd.toString()))); @@ -2165,7 +2165,7 @@ public class NMSImpl implements NMSBridge { if (npc == null) return superLeashed; boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return superLeashed; if (superLeashed) { entity.dropLeash(true, false); // clearLeash with client update @@ -2178,9 +2178,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, ""), false); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, ""), false); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.setCustomDisplay(mat != null); if (mat != null) { minecart.setDisplayBlockState(BuiltInRegistries.BLOCK.byId(mat.getId()).defaultBlockState()); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java index 8d600067a..b4b3985af 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java @@ -70,12 +70,12 @@ public class BatController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -84,7 +84,7 @@ public class BatController extends MobEntityController { return super.cc(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -161,7 +161,7 @@ public class BatController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java index dfa377396..8ffa47510 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java @@ -67,12 +67,12 @@ public class BlazeController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -80,7 +80,7 @@ public class BlazeController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -150,7 +150,7 @@ public class BlazeController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java index 3e3e4b085..47088bf26 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java @@ -76,12 +76,12 @@ public class CaveSpiderController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -90,7 +90,7 @@ public class CaveSpiderController extends MobEntityController { return super.cc(); } boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) { return super.cc(); } if (super.cc()) { @@ -196,7 +196,7 @@ public class CaveSpiderController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java index 727b2d4e5..07a715033 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java @@ -87,12 +87,12 @@ public class ChickenController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -100,7 +100,7 @@ public class ChickenController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -204,7 +204,7 @@ public class ChickenController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java index bad1862a8..3300f9fc7 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java @@ -102,12 +102,12 @@ public class CowController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -115,7 +115,7 @@ public class CowController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -211,7 +211,7 @@ public class CowController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java index c9c722dba..372408b07 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java @@ -85,12 +85,12 @@ public class CreeperController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -98,7 +98,7 @@ public class CreeperController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -214,7 +214,7 @@ public class CreeperController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java index 5bcdc7d15..50ebf1d2e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java @@ -67,12 +67,12 @@ public class EnderDragonController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -80,7 +80,7 @@ public class EnderDragonController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -163,7 +163,7 @@ public class EnderDragonController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java index cde5d40f9..91f434097 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java @@ -76,12 +76,12 @@ public class EndermanController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -89,7 +89,7 @@ public class EndermanController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -201,7 +201,7 @@ public class EndermanController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java index 513f403e7..392e5d074 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java @@ -76,12 +76,12 @@ public class EndermiteController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -89,7 +89,7 @@ public class EndermiteController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -192,7 +192,7 @@ public class EndermiteController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } } \ No newline at end of file diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java index b9e03ac95..b64cac9ad 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.CraftServer; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; @@ -22,6 +21,7 @@ import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.nms.v1_8_R3.network.EmptyNetHandler; @@ -70,7 +70,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private final Location packetLocationCache = new Location(null, 0, 0, 0); private final SkinPacketTracker skinTracker; private PlayerlistTrackerEntry trackerEntry; - private int updateCounter = 0; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -104,18 +103,18 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable @Override public boolean ae() { return npc == null ? super.ae() - : npc.data().has(NPC.COLLIDABLE_METADATA) ? npc.data(). get(NPC.COLLIDABLE_METADATA) + : npc.data().has(NPC.Metadata.COLLIDABLE) ? npc.data(). get(NPC.Metadata.COLLIDABLE) : !npc.isProtected(); } @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -401,9 +400,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable super.t_(); if (npc == null) return; - if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { - updateEffects = true; - } this.noclip = isSpectator(); Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); @@ -419,10 +415,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private void updatePackets(boolean navigating) { - if (updateCounter++ <= npc.data(). get(NPC.Metadata.PACKET_UPDATE_DELAY, - Setting.PACKET_UPDATE_DELAY.asInt())) + if (!npc.isUpdating(NPCUpdate.PACKET)) return; - updateCounter = 0; + updateEffects = true; boolean itemChanged = false; for (int slot = 0; slot < this.inventory.armor.length; slot++) { ItemStack equipment = getEquipment(slot); @@ -498,12 +493,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); } - @Override - public void setGameMode(GameMode mode) { - super.setGameMode(mode); - getHandle().noclip = mode == GameMode.SPECTATOR; - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java index be8089a01..1e5d1ae19 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java @@ -58,12 +58,12 @@ public class GhastController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -71,7 +71,7 @@ public class GhastController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -142,7 +142,7 @@ public class GhastController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java index 300ac9a4c..e1def6522 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java @@ -62,12 +62,12 @@ public class GiantController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class GiantController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -179,7 +179,7 @@ public class GiantController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java index 8aceed766..5f199bce6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java @@ -62,12 +62,12 @@ public class GuardianController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class GuardianController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -192,7 +192,7 @@ public class GuardianController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java index d36c1f30e..f4718015b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java @@ -85,12 +85,12 @@ public class HorseController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -98,7 +98,7 @@ public class HorseController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -204,7 +204,7 @@ public class HorseController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java index 020ec9a9b..b77a0adcd 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java @@ -65,7 +65,7 @@ public class HumanController extends AbstractEntityController { if (getBukkitEntity() == null || !getBukkitEntity().isValid() || getBukkitEntity() != handle.getBukkitEntity()) return; - boolean removeFromPlayerList = npc.data().get(NPC.REMOVE_FROM_PLAYERLIST_METADATA, + boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST, Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList); } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java index 18cb8d5dc..6995b327b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java @@ -62,12 +62,12 @@ public class IronGolemController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class IronGolemController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -179,7 +179,7 @@ public class IronGolemController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java index da27c9dd3..6fc62302d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java @@ -68,12 +68,12 @@ public class MagmaCubeController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -81,7 +81,7 @@ public class MagmaCubeController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -192,7 +192,7 @@ public class MagmaCubeController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java index 3637c6551..4ca01d153 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java @@ -82,12 +82,12 @@ public class MushroomCowController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -95,7 +95,7 @@ public class MushroomCowController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -189,7 +189,7 @@ public class MushroomCowController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java index 01049deb0..16ace92f6 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java @@ -73,12 +73,12 @@ public class OcelotController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -86,7 +86,7 @@ public class OcelotController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -187,7 +187,7 @@ public class OcelotController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java index 44c1c5040..ab6f54a07 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java @@ -74,12 +74,12 @@ public class PigController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -95,7 +95,7 @@ public class PigController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -198,7 +198,7 @@ public class PigController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java index c6d65901c..3b58c429c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java @@ -63,12 +63,12 @@ public class PigZombieController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -76,7 +76,7 @@ public class PigZombieController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -170,7 +170,7 @@ public class PigZombieController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java index f469883f1..60db72259 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java @@ -74,12 +74,12 @@ public class RabbitController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -87,7 +87,7 @@ public class RabbitController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -200,7 +200,7 @@ public class RabbitController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java index b934b7f46..dc905e364 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java @@ -73,12 +73,12 @@ public class SheepController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -86,7 +86,7 @@ public class SheepController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -180,7 +180,7 @@ public class SheepController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java index 9956a36da..c42e24e06 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java @@ -62,12 +62,12 @@ public class SilverfishController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class SilverfishController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -178,7 +178,7 @@ public class SilverfishController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java index 0e4a1f320..64b3d2751 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java @@ -62,12 +62,12 @@ public class SkeletonController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class SkeletonController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -179,7 +179,7 @@ public class SkeletonController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java index 85e0c6689..93b1bdf46 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java @@ -68,12 +68,12 @@ public class SlimeController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -81,7 +81,7 @@ public class SlimeController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -193,7 +193,7 @@ public class SlimeController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java index ae284e56c..32b34d688 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java @@ -62,12 +62,12 @@ public class SnowmanController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class SnowmanController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -191,7 +191,7 @@ public class SnowmanController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java index a28dc8a24..8c789e288 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java @@ -62,12 +62,12 @@ public class SpiderController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class SpiderController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -178,7 +178,7 @@ public class SpiderController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java index f96b15d17..715f4671a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java @@ -62,12 +62,12 @@ public class SquidController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class SquidController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -179,7 +179,7 @@ public class SquidController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java index 839f586f6..606f45799 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java @@ -77,7 +77,7 @@ public class VillagerController extends MobEntityController { @Override public boolean a(EntityHuman entityhuman) { - if (npc != null && npc.data().get(NPC.VILLAGER_BLOCK_TRADES, true)) { + if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) { blockingATrade = true; } return super.a(entityhuman); @@ -85,12 +85,12 @@ public class VillagerController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -98,7 +98,7 @@ public class VillagerController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -210,7 +210,7 @@ public class VillagerController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java index 80a144b7c..42bbbd7c2 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java @@ -62,12 +62,12 @@ public class WitchController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class WitchController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -178,7 +178,7 @@ public class WitchController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java index 063da741e..811002e78 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java @@ -53,12 +53,12 @@ public class WitherController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -66,7 +66,7 @@ public class WitherController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -148,7 +148,7 @@ public class WitherController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java index b9d6fee86..d53ae2c49 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java @@ -75,12 +75,12 @@ public class WolfController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -88,7 +88,7 @@ public class WolfController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -191,7 +191,7 @@ public class WolfController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java index f76906f66..af35eb846 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java @@ -62,12 +62,12 @@ public class ZombieController extends MobEntityController { @Override protected String bo() { - return NMSImpl.getSoundEffect(npc, super.bo(), NPC.HURT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); } @Override protected String bp() { - return NMSImpl.getSoundEffect(npc, super.bp(), NPC.DEATH_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.bp(), NPC.Metadata.DEATH_SOUND); } @Override @@ -75,7 +75,7 @@ public class ZombieController extends MobEntityController { if (npc == null) return super.cc(); boolean protectedDefault = npc.isProtected(); - if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault)) return super.cc(); if (super.cc()) { unleash(true, false); // clearLeash with client update @@ -170,7 +170,7 @@ public class ZombieController extends MobEntityController { @Override protected String z() { - return NMSImpl.getSoundEffect(npc, super.z(), NPC.AMBIENT_SOUND_METADATA); + return NMSImpl.getSoundEffect(npc, super.z(), NPC.Metadata.AMBIENT_SOUND); } } diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index 6143be70c..ed554746b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java @@ -832,8 +832,8 @@ public class NMSImpl implements NMSBridge { } @Override - public void playerTick(Player entity) { - ((EntityPlayer) getHandle(entity)).l(); + public Runnable playerTicker(Player entity) { + return ((EntityPlayer) getHandle(entity))::l; } @Override @@ -1585,7 +1585,7 @@ public class NMSImpl implements NMSBridge { : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getNavigation() : null; } - public static String getSoundEffect(NPC npc, String snd, String meta) { + public static String getSoundEffect(NPC npc, String snd, NPC.Metadata meta) { return npc == null || !npc.data().has(meta) ? snd : npc.data().get(meta, snd == null ? "" : snd.toString()); } @@ -1613,9 +1613,9 @@ public class NMSImpl implements NMSBridge { NPC npc = ((NPCHolder) minecart).getNPC(); if (npc == null) return; - Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); - int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); - int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + Material mat = Material.getMaterial(npc.data().get(NPC.Metadata.MINECART_ITEM, "")); + int data = npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0); + int offset = npc.data().get(NPC.Metadata.MINECART_OFFSET, 0); minecart.a(mat != null); if (mat != null) { minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data));