From e6f8a47f36533749984bfbd49d053c4ced1fef52 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 15 Mar 2023 01:41:24 +0800 Subject: [PATCH] Add config comments, remove subplugins, remove NPCEnderTeleportEvent --- .../main/java/net/citizensnpcs/Citizens.java | 30 -- .../main/java/net/citizensnpcs/Settings.java | 252 ++++++++++------ .../citizensnpcs/commands/NPCCommands.java | 2 - .../citizensnpcs/trait/BoundingBoxTrait.java | 12 +- .../net/citizensnpcs/trait/HologramTrait.java | 6 +- .../java/net/citizensnpcs/util/Messages.java | 2 - .../main/java/net/citizensnpcs/util/NMS.java | 17 -- .../java/net/citizensnpcs/util/NMSBridge.java | 2 - .../net/citizensnpcs/util/Quaternion.java | 4 + .../{nonliving => }/ArmorStandController.java | 268 +++++++++--------- .../nms/v1_10_R1/entity/BatController.java | 5 +- .../nms/v1_10_R1/entity/BlazeController.java | 5 +- .../v1_10_R1/entity/CaveSpiderController.java | 5 +- .../v1_10_R1/entity/ChickenController.java | 5 +- .../nms/v1_10_R1/entity/CowController.java | 5 +- .../v1_10_R1/entity/CreeperController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_10_R1/entity/EndermanController.java | 5 +- .../v1_10_R1/entity/EndermiteController.java | 5 +- .../nms/v1_10_R1/entity/EntityHumanNPC.java | 13 +- .../nms/v1_10_R1/entity/GhastController.java | 5 +- .../nms/v1_10_R1/entity/GiantController.java | 5 +- .../v1_10_R1/entity/GuardianController.java | 5 +- .../nms/v1_10_R1/entity/HorseController.java | 5 +- .../v1_10_R1/entity/IronGolemController.java | 5 +- .../v1_10_R1/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_10_R1/entity/OcelotController.java | 5 +- .../nms/v1_10_R1/entity/PigController.java | 5 +- .../v1_10_R1/entity/PigZombieController.java | 5 +- .../v1_10_R1/entity/PolarBearController.java | 5 +- .../nms/v1_10_R1/entity/RabbitController.java | 5 +- .../nms/v1_10_R1/entity/SheepController.java | 5 +- .../v1_10_R1/entity/ShulkerController.java | 5 +- .../v1_10_R1/entity/SilverfishController.java | 5 +- .../v1_10_R1/entity/SkeletonController.java | 5 +- .../nms/v1_10_R1/entity/SlimeController.java | 5 +- .../v1_10_R1/entity/SnowmanController.java | 5 +- .../nms/v1_10_R1/entity/SpiderController.java | 5 +- .../nms/v1_10_R1/entity/SquidController.java | 5 +- .../v1_10_R1/entity/VillagerController.java | 5 +- .../nms/v1_10_R1/entity/WitchController.java | 5 +- .../nms/v1_10_R1/entity/WitherController.java | 5 +- .../nms/v1_10_R1/entity/WolfController.java | 5 +- .../nms/v1_10_R1/entity/ZombieController.java | 5 +- .../nms/v1_10_R1/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 246 ++++++++-------- .../nms/v1_11_R1/entity/BatController.java | 5 +- .../nms/v1_11_R1/entity/BlazeController.java | 5 +- .../v1_11_R1/entity/CaveSpiderController.java | 5 +- .../v1_11_R1/entity/ChickenController.java | 5 +- .../nms/v1_11_R1/entity/CowController.java | 5 +- .../v1_11_R1/entity/CreeperController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_11_R1/entity/EndermanController.java | 5 +- .../v1_11_R1/entity/EndermiteController.java | 5 +- .../nms/v1_11_R1/entity/EntityHumanNPC.java | 13 +- .../nms/v1_11_R1/entity/EvokerController.java | 5 +- .../nms/v1_11_R1/entity/GhastController.java | 5 +- .../nms/v1_11_R1/entity/GiantController.java | 5 +- .../v1_11_R1/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_11_R1/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_11_R1/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_11_R1/entity/IronGolemController.java | 5 +- .../nms/v1_11_R1/entity/LlamaController.java | 5 +- .../v1_11_R1/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_11_R1/entity/OcelotController.java | 5 +- .../nms/v1_11_R1/entity/PigController.java | 5 +- .../v1_11_R1/entity/PigZombieController.java | 5 +- .../v1_11_R1/entity/PolarBearController.java | 5 +- .../nms/v1_11_R1/entity/RabbitController.java | 5 +- .../nms/v1_11_R1/entity/SheepController.java | 5 +- .../v1_11_R1/entity/ShulkerController.java | 5 +- .../v1_11_R1/entity/SilverfishController.java | 5 +- .../v1_11_R1/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_11_R1/entity/SlimeController.java | 5 +- .../v1_11_R1/entity/SnowmanController.java | 5 +- .../nms/v1_11_R1/entity/SpiderController.java | 5 +- .../nms/v1_11_R1/entity/SquidController.java | 5 +- .../nms/v1_11_R1/entity/VexController.java | 5 +- .../v1_11_R1/entity/VillagerController.java | 5 +- .../v1_11_R1/entity/VindicatorController.java | 5 +- .../nms/v1_11_R1/entity/WitchController.java | 5 +- .../nms/v1_11_R1/entity/WitherController.java | 5 +- .../nms/v1_11_R1/entity/WolfController.java | 5 +- .../nms/v1_11_R1/entity/ZombieController.java | 5 +- .../v1_11_R1/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_11_R1/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 243 ++++++++-------- .../nms/v1_12_R1/entity/BatController.java | 5 +- .../nms/v1_12_R1/entity/BlazeController.java | 5 +- .../v1_12_R1/entity/CaveSpiderController.java | 5 +- .../v1_12_R1/entity/ChickenController.java | 5 +- .../nms/v1_12_R1/entity/CowController.java | 5 +- .../v1_12_R1/entity/CreeperController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_12_R1/entity/EndermanController.java | 5 +- .../v1_12_R1/entity/EndermiteController.java | 5 +- .../nms/v1_12_R1/entity/EntityHumanNPC.java | 15 +- .../nms/v1_12_R1/entity/EvokerController.java | 5 +- .../nms/v1_12_R1/entity/GhastController.java | 5 +- .../nms/v1_12_R1/entity/GiantController.java | 5 +- .../v1_12_R1/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_12_R1/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_12_R1/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_12_R1/entity/IllusionerController.java | 5 +- .../v1_12_R1/entity/IronGolemController.java | 5 +- .../nms/v1_12_R1/entity/LlamaController.java | 5 +- .../v1_12_R1/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_12_R1/entity/OcelotController.java | 5 +- .../nms/v1_12_R1/entity/ParrotController.java | 5 +- .../nms/v1_12_R1/entity/PigController.java | 5 +- .../v1_12_R1/entity/PigZombieController.java | 5 +- .../v1_12_R1/entity/PolarBearController.java | 5 +- .../nms/v1_12_R1/entity/RabbitController.java | 5 +- .../nms/v1_12_R1/entity/SheepController.java | 5 +- .../v1_12_R1/entity/ShulkerController.java | 5 +- .../v1_12_R1/entity/SilverfishController.java | 5 +- .../v1_12_R1/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_12_R1/entity/SlimeController.java | 5 +- .../v1_12_R1/entity/SnowmanController.java | 5 +- .../nms/v1_12_R1/entity/SpiderController.java | 5 +- .../nms/v1_12_R1/entity/SquidController.java | 5 +- .../nms/v1_12_R1/entity/VexController.java | 5 +- .../v1_12_R1/entity/VillagerController.java | 5 +- .../v1_12_R1/entity/VindicatorController.java | 5 +- .../nms/v1_12_R1/entity/WitchController.java | 5 +- .../nms/v1_12_R1/entity/WitherController.java | 5 +- .../nms/v1_12_R1/entity/WolfController.java | 5 +- .../nms/v1_12_R1/entity/ZombieController.java | 5 +- .../v1_12_R1/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_12_R1/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 3 +- .../nms/v1_13_R2/entity/BatController.java | 5 +- .../nms/v1_13_R2/entity/BlazeController.java | 5 +- .../v1_13_R2/entity/CaveSpiderController.java | 5 +- .../v1_13_R2/entity/ChickenController.java | 5 +- .../nms/v1_13_R2/entity/CodController.java | 5 +- .../nms/v1_13_R2/entity/CowController.java | 5 +- .../v1_13_R2/entity/CreeperController.java | 5 +- .../v1_13_R2/entity/DolphinController.java | 5 +- .../v1_13_R2/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_13_R2/entity/EndermanController.java | 5 +- .../v1_13_R2/entity/EndermiteController.java | 5 +- .../nms/v1_13_R2/entity/EntityHumanNPC.java | 15 +- .../nms/v1_13_R2/entity/EvokerController.java | 5 +- .../nms/v1_13_R2/entity/GhastController.java | 5 +- .../nms/v1_13_R2/entity/GiantController.java | 5 +- .../v1_13_R2/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_13_R2/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_13_R2/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_13_R2/entity/IllusionerController.java | 5 +- .../v1_13_R2/entity/IronGolemController.java | 5 +- .../nms/v1_13_R2/entity/LlamaController.java | 5 +- .../v1_13_R2/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_13_R2/entity/OcelotController.java | 5 +- .../nms/v1_13_R2/entity/ParrotController.java | 5 +- .../v1_13_R2/entity/PhantomController.java | 5 +- .../nms/v1_13_R2/entity/PigController.java | 5 +- .../v1_13_R2/entity/PigZombieController.java | 5 +- .../v1_13_R2/entity/PolarBearController.java | 5 +- .../v1_13_R2/entity/PufferFishController.java | 5 +- .../nms/v1_13_R2/entity/RabbitController.java | 5 +- .../nms/v1_13_R2/entity/SalmonController.java | 5 +- .../nms/v1_13_R2/entity/SheepController.java | 5 +- .../v1_13_R2/entity/ShulkerController.java | 5 +- .../v1_13_R2/entity/SilverfishController.java | 5 +- .../v1_13_R2/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_13_R2/entity/SlimeController.java | 5 +- .../v1_13_R2/entity/SnowmanController.java | 5 +- .../nms/v1_13_R2/entity/SpiderController.java | 5 +- .../nms/v1_13_R2/entity/SquidController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_13_R2/entity/TurtleController.java | 5 +- .../nms/v1_13_R2/entity/VexController.java | 5 +- .../v1_13_R2/entity/VillagerController.java | 5 +- .../v1_13_R2/entity/VindicatorController.java | 5 +- .../nms/v1_13_R2/entity/WitchController.java | 5 +- .../nms/v1_13_R2/entity/WitherController.java | 5 +- .../nms/v1_13_R2/entity/WolfController.java | 5 +- .../nms/v1_13_R2/entity/ZombieController.java | 5 +- .../v1_13_R2/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_13_R2/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 3 +- .../nms/v1_14_R1/entity/BatController.java | 5 +- .../nms/v1_14_R1/entity/BlazeController.java | 5 +- .../nms/v1_14_R1/entity/CatController.java | 5 +- .../v1_14_R1/entity/CaveSpiderController.java | 5 +- .../v1_14_R1/entity/ChickenController.java | 5 +- .../nms/v1_14_R1/entity/CodController.java | 5 +- .../nms/v1_14_R1/entity/CowController.java | 5 +- .../v1_14_R1/entity/CreeperController.java | 5 +- .../v1_14_R1/entity/DolphinController.java | 5 +- .../v1_14_R1/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_14_R1/entity/EndermanController.java | 5 +- .../v1_14_R1/entity/EndermiteController.java | 5 +- .../nms/v1_14_R1/entity/EntityHumanNPC.java | 15 +- .../nms/v1_14_R1/entity/EvokerController.java | 5 +- .../nms/v1_14_R1/entity/FoxController.java | 5 +- .../nms/v1_14_R1/entity/GhastController.java | 5 +- .../nms/v1_14_R1/entity/GiantController.java | 5 +- .../v1_14_R1/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_14_R1/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_14_R1/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_14_R1/entity/IllusionerController.java | 5 +- .../v1_14_R1/entity/IronGolemController.java | 5 +- .../nms/v1_14_R1/entity/LlamaController.java | 5 +- .../v1_14_R1/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_14_R1/entity/OcelotController.java | 5 +- .../nms/v1_14_R1/entity/PandaController.java | 5 +- .../nms/v1_14_R1/entity/ParrotController.java | 5 +- .../v1_14_R1/entity/PhantomController.java | 5 +- .../nms/v1_14_R1/entity/PigController.java | 5 +- .../v1_14_R1/entity/PigZombieController.java | 5 +- .../v1_14_R1/entity/PillagerController.java | 5 +- .../v1_14_R1/entity/PolarBearController.java | 5 +- .../v1_14_R1/entity/PufferFishController.java | 5 +- .../nms/v1_14_R1/entity/RabbitController.java | 5 +- .../v1_14_R1/entity/RavagerController.java | 5 +- .../nms/v1_14_R1/entity/SalmonController.java | 5 +- .../nms/v1_14_R1/entity/SheepController.java | 5 +- .../v1_14_R1/entity/ShulkerController.java | 5 +- .../v1_14_R1/entity/SilverfishController.java | 5 +- .../v1_14_R1/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_14_R1/entity/SlimeController.java | 5 +- .../v1_14_R1/entity/SnowmanController.java | 5 +- .../nms/v1_14_R1/entity/SpiderController.java | 5 +- .../nms/v1_14_R1/entity/SquidController.java | 5 +- .../entity/TraderLlamaController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_14_R1/entity/TurtleController.java | 5 +- .../nms/v1_14_R1/entity/VexController.java | 5 +- .../v1_14_R1/entity/VillagerController.java | 5 +- .../v1_14_R1/entity/VindicatorController.java | 5 +- .../entity/WanderingTraderController.java | 5 +- .../nms/v1_14_R1/entity/WitchController.java | 5 +- .../nms/v1_14_R1/entity/WitherController.java | 5 +- .../nms/v1_14_R1/entity/WolfController.java | 5 +- .../nms/v1_14_R1/entity/ZombieController.java | 5 +- .../v1_14_R1/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_14_R1/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 3 +- .../nms/v1_15_R1/entity/BatController.java | 5 +- .../nms/v1_15_R1/entity/BeeController.java | 5 +- .../nms/v1_15_R1/entity/BlazeController.java | 5 +- .../nms/v1_15_R1/entity/CatController.java | 5 +- .../v1_15_R1/entity/CaveSpiderController.java | 5 +- .../v1_15_R1/entity/ChickenController.java | 5 +- .../nms/v1_15_R1/entity/CodController.java | 5 +- .../nms/v1_15_R1/entity/CowController.java | 5 +- .../v1_15_R1/entity/CreeperController.java | 5 +- .../v1_15_R1/entity/DolphinController.java | 5 +- .../v1_15_R1/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_15_R1/entity/EndermanController.java | 5 +- .../v1_15_R1/entity/EndermiteController.java | 5 +- .../nms/v1_15_R1/entity/EntityHumanNPC.java | 15 +- .../nms/v1_15_R1/entity/EvokerController.java | 5 +- .../nms/v1_15_R1/entity/FoxController.java | 5 +- .../nms/v1_15_R1/entity/GhastController.java | 5 +- .../nms/v1_15_R1/entity/GiantController.java | 5 +- .../v1_15_R1/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_15_R1/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_15_R1/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_15_R1/entity/IllusionerController.java | 5 +- .../v1_15_R1/entity/IronGolemController.java | 5 +- .../nms/v1_15_R1/entity/LlamaController.java | 5 +- .../v1_15_R1/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_15_R1/entity/OcelotController.java | 5 +- .../nms/v1_15_R1/entity/PandaController.java | 5 +- .../nms/v1_15_R1/entity/ParrotController.java | 5 +- .../v1_15_R1/entity/PhantomController.java | 5 +- .../nms/v1_15_R1/entity/PigController.java | 5 +- .../v1_15_R1/entity/PigZombieController.java | 5 +- .../v1_15_R1/entity/PillagerController.java | 5 +- .../v1_15_R1/entity/PolarBearController.java | 5 +- .../v1_15_R1/entity/PufferFishController.java | 5 +- .../nms/v1_15_R1/entity/RabbitController.java | 5 +- .../v1_15_R1/entity/RavagerController.java | 5 +- .../nms/v1_15_R1/entity/SalmonController.java | 5 +- .../nms/v1_15_R1/entity/SheepController.java | 5 +- .../v1_15_R1/entity/ShulkerController.java | 5 +- .../v1_15_R1/entity/SilverfishController.java | 5 +- .../v1_15_R1/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_15_R1/entity/SlimeController.java | 5 +- .../v1_15_R1/entity/SnowmanController.java | 5 +- .../nms/v1_15_R1/entity/SpiderController.java | 5 +- .../nms/v1_15_R1/entity/SquidController.java | 5 +- .../entity/TraderLlamaController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_15_R1/entity/TurtleController.java | 5 +- .../nms/v1_15_R1/entity/VexController.java | 5 +- .../v1_15_R1/entity/VillagerController.java | 5 +- .../v1_15_R1/entity/VindicatorController.java | 5 +- .../entity/WanderingTraderController.java | 5 +- .../nms/v1_15_R1/entity/WitchController.java | 5 +- .../nms/v1_15_R1/entity/WitherController.java | 5 +- .../nms/v1_15_R1/entity/WolfController.java | 5 +- .../nms/v1_15_R1/entity/ZombieController.java | 5 +- .../v1_15_R1/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_15_R1/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 3 +- .../nms/v1_16_R3/entity/BatController.java | 5 +- .../nms/v1_16_R3/entity/BeeController.java | 5 +- .../nms/v1_16_R3/entity/BlazeController.java | 5 +- .../nms/v1_16_R3/entity/CatController.java | 5 +- .../v1_16_R3/entity/CaveSpiderController.java | 5 +- .../v1_16_R3/entity/ChickenController.java | 5 +- .../nms/v1_16_R3/entity/CodController.java | 5 +- .../nms/v1_16_R3/entity/CowController.java | 5 +- .../v1_16_R3/entity/CreeperController.java | 5 +- .../v1_16_R3/entity/DolphinController.java | 5 +- .../v1_16_R3/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_16_R3/entity/EndermanController.java | 5 +- .../v1_16_R3/entity/EndermiteController.java | 5 +- .../nms/v1_16_R3/entity/EntityHumanNPC.java | 15 +- .../nms/v1_16_R3/entity/EvokerController.java | 5 +- .../nms/v1_16_R3/entity/FoxController.java | 5 +- .../nms/v1_16_R3/entity/GhastController.java | 5 +- .../nms/v1_16_R3/entity/GiantController.java | 5 +- .../v1_16_R3/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_16_R3/entity/HoglinController.java | 5 +- .../nms/v1_16_R3/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_16_R3/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_16_R3/entity/IllusionerController.java | 5 +- .../v1_16_R3/entity/IronGolemController.java | 5 +- .../nms/v1_16_R3/entity/LlamaController.java | 5 +- .../v1_16_R3/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_16_R3/entity/OcelotController.java | 5 +- .../nms/v1_16_R3/entity/PandaController.java | 5 +- .../nms/v1_16_R3/entity/ParrotController.java | 5 +- .../v1_16_R3/entity/PhantomController.java | 5 +- .../nms/v1_16_R3/entity/PigController.java | 5 +- .../v1_16_R3/entity/PigZombieController.java | 5 +- .../entity/PiglinBruteController.java | 5 +- .../nms/v1_16_R3/entity/PiglinController.java | 5 +- .../v1_16_R3/entity/PillagerController.java | 5 +- .../v1_16_R3/entity/PolarBearController.java | 5 +- .../v1_16_R3/entity/PufferFishController.java | 5 +- .../nms/v1_16_R3/entity/RabbitController.java | 5 +- .../v1_16_R3/entity/RavagerController.java | 5 +- .../nms/v1_16_R3/entity/SalmonController.java | 5 +- .../nms/v1_16_R3/entity/SheepController.java | 5 +- .../v1_16_R3/entity/ShulkerController.java | 5 +- .../v1_16_R3/entity/SilverfishController.java | 5 +- .../v1_16_R3/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_16_R3/entity/SlimeController.java | 5 +- .../v1_16_R3/entity/SnowmanController.java | 5 +- .../nms/v1_16_R3/entity/SpiderController.java | 5 +- .../nms/v1_16_R3/entity/SquidController.java | 5 +- .../v1_16_R3/entity/StriderController.java | 5 +- .../entity/TraderLlamaController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_16_R3/entity/TurtleController.java | 5 +- .../nms/v1_16_R3/entity/VexController.java | 5 +- .../v1_16_R3/entity/VillagerController.java | 5 +- .../v1_16_R3/entity/VindicatorController.java | 5 +- .../entity/WanderingTraderController.java | 5 +- .../nms/v1_16_R3/entity/WitchController.java | 5 +- .../nms/v1_16_R3/entity/WitherController.java | 5 +- .../nms/v1_16_R3/entity/WolfController.java | 5 +- .../nms/v1_16_R3/entity/ZoglinController.java | 5 +- .../nms/v1_16_R3/entity/ZombieController.java | 5 +- .../v1_16_R3/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_16_R3/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 3 +- .../v1_17_R1/entity/AxolotlController.java | 5 +- .../nms/v1_17_R1/entity/BatController.java | 5 +- .../nms/v1_17_R1/entity/BeeController.java | 5 +- .../nms/v1_17_R1/entity/BlazeController.java | 5 +- .../nms/v1_17_R1/entity/CatController.java | 5 +- .../v1_17_R1/entity/CaveSpiderController.java | 5 +- .../v1_17_R1/entity/ChickenController.java | 5 +- .../nms/v1_17_R1/entity/CodController.java | 5 +- .../nms/v1_17_R1/entity/CowController.java | 5 +- .../v1_17_R1/entity/CreeperController.java | 5 +- .../v1_17_R1/entity/DolphinController.java | 5 +- .../v1_17_R1/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_17_R1/entity/EndermanController.java | 5 +- .../v1_17_R1/entity/EndermiteController.java | 5 +- .../nms/v1_17_R1/entity/EntityHumanNPC.java | 15 +- .../nms/v1_17_R1/entity/EvokerController.java | 5 +- .../nms/v1_17_R1/entity/FoxController.java | 5 +- .../nms/v1_17_R1/entity/GhastController.java | 5 +- .../nms/v1_17_R1/entity/GiantController.java | 5 +- .../v1_17_R1/entity/GlowSquidController.java | 5 +- .../nms/v1_17_R1/entity/GoatController.java | 5 +- .../v1_17_R1/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_17_R1/entity/HoglinController.java | 5 +- .../nms/v1_17_R1/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_17_R1/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_17_R1/entity/IllusionerController.java | 5 +- .../v1_17_R1/entity/IronGolemController.java | 5 +- .../nms/v1_17_R1/entity/LlamaController.java | 5 +- .../v1_17_R1/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_17_R1/entity/OcelotController.java | 5 +- .../nms/v1_17_R1/entity/PandaController.java | 5 +- .../nms/v1_17_R1/entity/ParrotController.java | 5 +- .../v1_17_R1/entity/PhantomController.java | 5 +- .../nms/v1_17_R1/entity/PigController.java | 5 +- .../v1_17_R1/entity/PigZombieController.java | 5 +- .../entity/PiglinBruteController.java | 5 +- .../nms/v1_17_R1/entity/PiglinController.java | 5 +- .../v1_17_R1/entity/PillagerController.java | 5 +- .../v1_17_R1/entity/PolarBearController.java | 5 +- .../v1_17_R1/entity/PufferFishController.java | 5 +- .../nms/v1_17_R1/entity/RabbitController.java | 5 +- .../v1_17_R1/entity/RavagerController.java | 5 +- .../nms/v1_17_R1/entity/SalmonController.java | 5 +- .../nms/v1_17_R1/entity/SheepController.java | 5 +- .../v1_17_R1/entity/ShulkerController.java | 5 +- .../v1_17_R1/entity/SilverfishController.java | 13 +- .../v1_17_R1/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_17_R1/entity/SlimeController.java | 5 +- .../v1_17_R1/entity/SnowmanController.java | 5 +- .../nms/v1_17_R1/entity/SpiderController.java | 5 +- .../nms/v1_17_R1/entity/SquidController.java | 5 +- .../v1_17_R1/entity/StriderController.java | 5 +- .../entity/TraderLlamaController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_17_R1/entity/TurtleController.java | 5 +- .../nms/v1_17_R1/entity/VexController.java | 5 +- .../v1_17_R1/entity/VillagerController.java | 5 +- .../v1_17_R1/entity/VindicatorController.java | 5 +- .../entity/WanderingTraderController.java | 5 +- .../nms/v1_17_R1/entity/WitchController.java | 5 +- .../nms/v1_17_R1/entity/WitherController.java | 5 +- .../nms/v1_17_R1/entity/WolfController.java | 5 +- .../nms/v1_17_R1/entity/ZoglinController.java | 5 +- .../nms/v1_17_R1/entity/ZombieController.java | 5 +- .../v1_17_R1/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_17_R1/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 3 +- .../v1_18_R2/entity/AxolotlController.java | 5 +- .../nms/v1_18_R2/entity/BatController.java | 5 +- .../nms/v1_18_R2/entity/BeeController.java | 5 +- .../nms/v1_18_R2/entity/BlazeController.java | 5 +- .../nms/v1_18_R2/entity/CatController.java | 5 +- .../v1_18_R2/entity/CaveSpiderController.java | 5 +- .../v1_18_R2/entity/ChickenController.java | 5 +- .../nms/v1_18_R2/entity/CodController.java | 5 +- .../nms/v1_18_R2/entity/CowController.java | 5 +- .../v1_18_R2/entity/CreeperController.java | 5 +- .../v1_18_R2/entity/DolphinController.java | 5 +- .../v1_18_R2/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_18_R2/entity/EndermanController.java | 5 +- .../v1_18_R2/entity/EndermiteController.java | 5 +- .../nms/v1_18_R2/entity/EntityHumanNPC.java | 15 +- .../nms/v1_18_R2/entity/EvokerController.java | 5 +- .../nms/v1_18_R2/entity/FoxController.java | 5 +- .../nms/v1_18_R2/entity/GhastController.java | 5 +- .../nms/v1_18_R2/entity/GiantController.java | 5 +- .../v1_18_R2/entity/GlowSquidController.java | 5 +- .../nms/v1_18_R2/entity/GoatController.java | 5 +- .../v1_18_R2/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_18_R2/entity/HoglinController.java | 5 +- .../nms/v1_18_R2/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_18_R2/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_18_R2/entity/IllusionerController.java | 5 +- .../v1_18_R2/entity/IronGolemController.java | 5 +- .../nms/v1_18_R2/entity/LlamaController.java | 5 +- .../v1_18_R2/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_18_R2/entity/OcelotController.java | 5 +- .../nms/v1_18_R2/entity/PandaController.java | 5 +- .../nms/v1_18_R2/entity/ParrotController.java | 5 +- .../v1_18_R2/entity/PhantomController.java | 5 +- .../nms/v1_18_R2/entity/PigController.java | 5 +- .../v1_18_R2/entity/PigZombieController.java | 5 +- .../entity/PiglinBruteController.java | 5 +- .../nms/v1_18_R2/entity/PiglinController.java | 5 +- .../v1_18_R2/entity/PillagerController.java | 5 +- .../v1_18_R2/entity/PolarBearController.java | 5 +- .../v1_18_R2/entity/PufferFishController.java | 5 +- .../nms/v1_18_R2/entity/RabbitController.java | 5 +- .../v1_18_R2/entity/RavagerController.java | 5 +- .../nms/v1_18_R2/entity/SalmonController.java | 5 +- .../nms/v1_18_R2/entity/SheepController.java | 5 +- .../v1_18_R2/entity/ShulkerController.java | 5 +- .../v1_18_R2/entity/SilverfishController.java | 13 +- .../v1_18_R2/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_18_R2/entity/SlimeController.java | 5 +- .../v1_18_R2/entity/SnowmanController.java | 5 +- .../nms/v1_18_R2/entity/SpiderController.java | 5 +- .../nms/v1_18_R2/entity/SquidController.java | 5 +- .../v1_18_R2/entity/StriderController.java | 5 +- .../entity/TraderLlamaController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_18_R2/entity/TurtleController.java | 5 +- .../nms/v1_18_R2/entity/VexController.java | 5 +- .../v1_18_R2/entity/VillagerController.java | 5 +- .../v1_18_R2/entity/VindicatorController.java | 5 +- .../entity/WanderingTraderController.java | 5 +- .../nms/v1_18_R2/entity/WitchController.java | 5 +- .../nms/v1_18_R2/entity/WitherController.java | 5 +- .../nms/v1_18_R2/entity/WolfController.java | 5 +- .../nms/v1_18_R2/entity/ZoglinController.java | 5 +- .../nms/v1_18_R2/entity/ZombieController.java | 5 +- .../v1_18_R2/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_18_R2/util/NMSImpl.java | 8 +- .../nms/v1_19_R2/entity/AllayController.java | 5 - .../{nonliving => }/ArmorStandController.java | 3 +- .../v1_19_R2/entity/AxolotlController.java | 5 +- .../nms/v1_19_R2/entity/BatController.java | 5 - .../nms/v1_19_R2/entity/BeeController.java | 5 +- .../nms/v1_19_R2/entity/BlazeController.java | 5 +- .../nms/v1_19_R2/entity/CamelController.java | 5 +- .../nms/v1_19_R2/entity/CatController.java | 5 +- .../v1_19_R2/entity/CaveSpiderController.java | 5 +- .../v1_19_R2/entity/ChickenController.java | 5 +- .../nms/v1_19_R2/entity/CodController.java | 5 +- .../nms/v1_19_R2/entity/CowController.java | 5 +- .../v1_19_R2/entity/CreeperController.java | 5 +- .../v1_19_R2/entity/DolphinController.java | 5 +- .../v1_19_R2/entity/DrownedController.java | 5 +- .../entity/EnderDragonController.java | 5 +- .../v1_19_R2/entity/EndermanController.java | 5 +- .../v1_19_R2/entity/EndermiteController.java | 5 +- .../nms/v1_19_R2/entity/EntityHumanNPC.java | 15 +- .../nms/v1_19_R2/entity/EvokerController.java | 5 +- .../nms/v1_19_R2/entity/FoxController.java | 5 +- .../nms/v1_19_R2/entity/FrogController.java | 5 +- .../nms/v1_19_R2/entity/GhastController.java | 5 +- .../nms/v1_19_R2/entity/GiantController.java | 5 +- .../v1_19_R2/entity/GlowSquidController.java | 5 +- .../nms/v1_19_R2/entity/GoatController.java | 5 +- .../v1_19_R2/entity/GuardianController.java | 5 +- .../entity/GuardianElderController.java | 5 +- .../nms/v1_19_R2/entity/HoglinController.java | 5 +- .../nms/v1_19_R2/entity/HorseController.java | 5 +- .../entity/HorseDonkeyController.java | 5 +- .../v1_19_R2/entity/HorseMuleController.java | 5 +- .../entity/HorseSkeletonController.java | 5 +- .../entity/HorseZombieController.java | 5 +- .../v1_19_R2/entity/IllusionerController.java | 5 +- .../v1_19_R2/entity/IronGolemController.java | 5 +- .../nms/v1_19_R2/entity/LlamaController.java | 5 +- .../v1_19_R2/entity/MagmaCubeController.java | 5 +- .../entity/MushroomCowController.java | 5 +- .../nms/v1_19_R2/entity/OcelotController.java | 5 +- .../nms/v1_19_R2/entity/PandaController.java | 5 +- .../nms/v1_19_R2/entity/ParrotController.java | 5 +- .../v1_19_R2/entity/PhantomController.java | 5 +- .../nms/v1_19_R2/entity/PigController.java | 5 +- .../v1_19_R2/entity/PigZombieController.java | 5 +- .../entity/PiglinBruteController.java | 5 +- .../nms/v1_19_R2/entity/PiglinController.java | 5 +- .../v1_19_R2/entity/PillagerController.java | 5 +- .../v1_19_R2/entity/PolarBearController.java | 5 +- .../v1_19_R2/entity/PufferFishController.java | 5 +- .../nms/v1_19_R2/entity/RabbitController.java | 5 +- .../v1_19_R2/entity/RavagerController.java | 5 +- .../nms/v1_19_R2/entity/SalmonController.java | 5 +- .../nms/v1_19_R2/entity/SheepController.java | 5 +- .../v1_19_R2/entity/ShulkerController.java | 5 +- .../v1_19_R2/entity/SilverfishController.java | 13 +- .../v1_19_R2/entity/SkeletonController.java | 5 +- .../entity/SkeletonStrayController.java | 5 +- .../entity/SkeletonWitherController.java | 5 +- .../nms/v1_19_R2/entity/SlimeController.java | 5 +- .../v1_19_R2/entity/SnowmanController.java | 5 +- .../nms/v1_19_R2/entity/SpiderController.java | 5 +- .../nms/v1_19_R2/entity/SquidController.java | 5 +- .../v1_19_R2/entity/StriderController.java | 5 +- .../v1_19_R2/entity/TadpoleController.java | 5 +- .../entity/TraderLlamaController.java | 5 +- .../entity/TropicalFishController.java | 5 +- .../nms/v1_19_R2/entity/TurtleController.java | 5 +- .../nms/v1_19_R2/entity/VexController.java | 5 +- .../v1_19_R2/entity/VillagerController.java | 5 +- .../v1_19_R2/entity/VindicatorController.java | 5 +- .../entity/WanderingTraderController.java | 5 +- .../nms/v1_19_R2/entity/WardenController.java | 5 +- .../nms/v1_19_R2/entity/WitchController.java | 5 +- .../nms/v1_19_R2/entity/WitherController.java | 5 +- .../nms/v1_19_R2/entity/WolfController.java | 5 +- .../nms/v1_19_R2/entity/ZoglinController.java | 5 +- .../nms/v1_19_R2/entity/ZombieController.java | 5 +- .../v1_19_R2/entity/ZombieHuskController.java | 5 +- .../entity/ZombieVillagerController.java | 5 +- .../nms/v1_19_R2/util/NMSImpl.java | 8 +- .../{nonliving => }/ArmorStandController.java | 6 +- .../nms/v1_8_R3/entity/BatController.java | 5 +- .../nms/v1_8_R3/entity/BlazeController.java | 5 +- .../v1_8_R3/entity/CaveSpiderController.java | 5 +- .../nms/v1_8_R3/entity/ChickenController.java | 5 +- .../nms/v1_8_R3/entity/CowController.java | 5 +- .../nms/v1_8_R3/entity/CreeperController.java | 5 +- .../v1_8_R3/entity/EnderDragonController.java | 5 +- .../v1_8_R3/entity/EndermanController.java | 5 +- .../v1_8_R3/entity/EndermiteController.java | 5 +- .../nms/v1_8_R3/entity/EntityHumanNPC.java | 12 - .../nms/v1_8_R3/entity/GhastController.java | 5 +- .../nms/v1_8_R3/entity/GiantController.java | 5 +- .../v1_8_R3/entity/GuardianController.java | 5 +- .../nms/v1_8_R3/entity/HorseController.java | 5 +- .../v1_8_R3/entity/IronGolemController.java | 5 +- .../v1_8_R3/entity/MagmaCubeController.java | 5 +- .../v1_8_R3/entity/MushroomCowController.java | 5 +- .../nms/v1_8_R3/entity/OcelotController.java | 5 +- .../nms/v1_8_R3/entity/PigController.java | 5 +- .../v1_8_R3/entity/PigZombieController.java | 5 +- .../nms/v1_8_R3/entity/RabbitController.java | 5 +- .../nms/v1_8_R3/entity/SheepController.java | 5 +- .../v1_8_R3/entity/SilverfishController.java | 5 +- .../v1_8_R3/entity/SkeletonController.java | 5 +- .../nms/v1_8_R3/entity/SlimeController.java | 5 +- .../nms/v1_8_R3/entity/SnowmanController.java | 5 +- .../nms/v1_8_R3/entity/SpiderController.java | 5 +- .../nms/v1_8_R3/entity/SquidController.java | 5 +- .../v1_8_R3/entity/VillagerController.java | 5 +- .../nms/v1_8_R3/entity/WitchController.java | 5 +- .../nms/v1_8_R3/entity/WitherController.java | 5 +- .../nms/v1_8_R3/entity/WolfController.java | 5 +- .../nms/v1_8_R3/entity/ZombieController.java | 5 +- .../nms/v1_8_R3/util/NMSImpl.java | 8 +- 684 files changed, 1251 insertions(+), 3340 deletions(-) rename v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/{nonliving => }/ArmorStandController.java (94%) rename v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/{nonliving => }/ArmorStandController.java (94%) rename v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/{nonliving => }/ArmorStandController.java (94%) rename v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/{nonliving => }/ArmorStandController.java (97%) rename v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/{nonliving => }/ArmorStandController.java (97%) diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java index 97fc3c8d3..8e3653e61 100644 --- a/main/src/main/java/net/citizensnpcs/Citizens.java +++ b/main/src/main/java/net/citizensnpcs/Citizens.java @@ -203,33 +203,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { } } - private void enableSubPlugins() { - File root = new File(getDataFolder(), Setting.SUBPLUGIN_FOLDER.asString()); - if (!root.exists() || !root.isDirectory()) - return; - File[] files = root.listFiles(); - for (File file : files) { - Plugin plugin; - try { - plugin = Bukkit.getPluginManager().loadPlugin(file); - } catch (Exception e) { - continue; - } - if (plugin == null) - continue; - // code beneath modified from CraftServer - try { - Messaging.logTr(Messages.LOADING_SUB_PLUGIN, plugin.getDescription().getFullName()); - plugin.onLoad(); - } catch (Throwable ex) { - Messaging.severeTr(Messages.ERROR_INITALISING_SUB_PLUGIN, ex.getMessage(), - plugin.getDescription().getFullName()); - ex.printStackTrace(); - } - } - NMS.loadPlugins(); - } - @Override public CommandManager getCommandManager() { return commands; @@ -457,7 +430,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { setupEconomy(); registerCommands(); - enableSubPlugins(); NMS.load(commands); Template.migrate(); Bukkit.getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); @@ -622,8 +594,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { Messaging.logTr(Messages.NUM_LOADED_NOTIFICATION, Iterables.size(npcRegistry), "?"); startMetrics(); - System.out.println(Setting.SAVE_TASK_DELAY.asTicks()); - System.out.println(Setting.SAVE_TASK_DELAY.asTicks() / 20); scheduleSaveTask(Setting.SAVE_TASK_DELAY.asTicks()); Bukkit.getPluginManager().callEvent(new CitizensEnableEvent()); new PlayerUpdateTask().runTaskTimer(Citizens.this, 0, 1); diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java index 82a39dfd0..9ec7d34e6 100644 --- a/main/src/main/java/net/citizensnpcs/Settings.java +++ b/main/src/main/java/net/citizensnpcs/Settings.java @@ -3,6 +3,7 @@ package net.citizensnpcs; import java.io.File; import java.time.Duration; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -14,6 +15,7 @@ import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.api.util.Storage; import net.citizensnpcs.api.util.YamlStorage; +import net.citizensnpcs.api.util.YamlStorage.YamlKey; import net.citizensnpcs.util.Util; public class Settings { @@ -61,49 +63,84 @@ public class Settings { } public enum Setting { - ALWAYS_USE_NAME_HOLOGRAM("npc.always-use-name-holograms", false), - ASTAR_ITERATIONS_PER_TICK("npc.pathfinding.new-finder.iterations-per-tick", - "npc.pathfinding.new-finder.iterations-per-tick", 2500), - AUTH_SERVER_URL("general.authlib.profile-url", "https://sessionserver.mojang.com/session/minecraft/profile/"), - BOSSBAR_RANGE("npc.default.bossbar-view-range", 64), - CHAT_BYSTANDERS_HEAR_TARGETED_CHAT("npc.chat.options.bystanders-hear-targeted-chat", false), - CHAT_FORMAT("npc.chat.format.no-targets", "[]: "), - CHAT_FORMAT_TO_BYSTANDERS("npc.chat.format.with-target-to-bystanders", "[] -> []: "), - CHAT_FORMAT_TO_TARGET("npc.chat.format.to-target", ": "), - CHAT_FORMAT_WITH_TARGETS_TO_BYSTANDERS("npc.chat.format.with-targets-to-bystanders", - "[] -> []: "), - CHAT_MAX_NUMBER_OF_TARGETS("npc.chat.options.max-number-of-targets-to-show", 2), + ALWAYS_USE_NAME_HOLOGRAM("Always use holograms for names instead of only for hex colors / placeholders", + "npc.always-use-name-holograms", false), + ASTAR_ITERATIONS_PER_TICK("Number of blocks to search per tick (Citizens pathfinder)", + "npc.pathfinding.new-finder.iterations-per-tick", "npc.pathfinding.new-finder.iterations-per-tick", + 250), + AUTH_SERVER_URL("Search for gameprofiles using this URL", "general.authlib.profile-url", + "https://sessionserver.mojang.com/session/minecraft/profile/"), + BOSSBAR_RANGE("The default bossbar range, in blocks", "npc.default.bossbar-view-range", 64), + CHAT_BYSTANDERS_HEAR_TARGETED_CHAT( + "Whether nearby players also hear text, even if targeted at a specific player", + "npc.chat.options.bystanders-hear-targeted-chat", false), + CHAT_FORMAT("The default text format (placeholder enabled)", "npc.chat.format.no-targets", "[]: "), + CHAT_FORMAT_TO_BYSTANDERS("The default text format for nearby players (placeholder enabled)", + "npc.chat.format.with-target-to-bystanders", "[] -> []: "), + CHAT_FORMAT_TO_TARGET("The default text format for targeted text (placeholder enabled)", + "npc.chat.format.to-target", ": "), + CHAT_FORMAT_WITH_TARGETS_TO_BYSTANDERS("The default text format for nearby players (placeholder enabled)", + "npc.chat.format.with-targets-to-bystanders", "[] -> []: "), + CHAT_MAX_NUMBER_OF_TARGETS("Number of target names to show to bystanders", + "npc.chat.options.max-number-of-targets-to-show", 2), CHAT_MULTIPLE_TARGETS_FORMAT("npc.chat.options.multiple-targets-format", "|, | & | & others"), - CHAT_RANGE("npc.chat.options.range", 5), - CHECK_MINECRAFT_VERSION("advanced.check-minecraft-version", true), - CONTROLLABLE_GROUND_DIRECTION_MODIFIER("npc.controllable.ground-direction-modifier", 1.0D), - DEBUG_CHUNK_LOADS("general.debug-chunk-loads", false), - DEBUG_FILE("general.debug-file", ""), - DEBUG_MODE("general.debug-mode", false), - DEBUG_PATHFINDING("general.debug-pathfinding", false), - DEFAULT_BLOCK_BREAKER_RADIUS("npc.defaults.block-breaker-radius", "npc.default.block-breaker-radius", -1), - DEFAULT_CACHE_WAYPOINT_PATHS("npc.default.waypoints.cache-paths", false), - DEFAULT_DESTINATION_TELEPORT_MARGIN("npc.pathfinding.defaults.destination-teleport-margin", + CHAT_RANGE("Nearby player range in blocks", "npc.chat.options.range", 5), + CHECK_MINECRAFT_VERSION("Whether to check the minecraft version for compatibility (do not change)", + "advanced.check-minecraft-version", true), + CONTROLLABLE_GROUND_DIRECTION_MODIFIER("The percentage to increase speed when controlling NPCs on the ground", + "npc.controllable.ground-direction-modifier", 1.0D), + DEBUG_CHUNK_LOADS("Debug chunk load stack traces, not as useful in recent Minecraft versions", + "general.debug-chunk-loads", false), + DEBUG_FILE("Send Citizens debug output to a specific file", "general.debug-file", ""), + DEBUG_MODE("Enable Citizens debugging", "general.debug-mode", false), + DEBUG_PATHFINDING("Debug pathfinding by showing fake target blocks", "general.debug-pathfinding", false), + DEFAULT_BLOCK_BREAKER_RADIUS( + "The default distance radius for block breaking, in blocks
The NPC will pathfind to be this far away from the target block if greater than 0", + "npc.defaults.block-breaker-radius", "npc.default.block-breaker-radius", -1), + DEFAULT_CACHE_WAYPOINT_PATHS( + "Whether to cache /npc path by default
Can eliminate pathfinding for repetitive static paths", + "npc.default.waypoints.cache-paths", false), + DEFAULT_DESTINATION_TELEPORT_MARGIN( + "The default distance in blocks where the NPC will just teleport to the destination
Useful when trying to get exactly to the destination", + "npc.pathfinding.defaults.destination-teleport-margin", "npc.pathfinding.default-destination-teleport-margin", -1), - DEFAULT_DISTANCE_MARGIN("npc.pathfinding.default-distance-margin", 2), - DEFAULT_LOOK_CLOSE("npc.default.look-close.enabled", false), - DEFAULT_LOOK_CLOSE_RANGE("npc.default.look-close.range", 5), - DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT("npc.hologram.default-line-height", 0.4D), - DEFAULT_NPC_LIMIT("npc.limits.default-limit", 10), - DEFAULT_PATH_DISTANCE_MARGIN("npc.pathfinding.default-path-distance-margin", 1), - DEFAULT_PATHFINDER_UPDATE_PATH_RATE("npc.pathfinding.update-path-rate", "1s"), - DEFAULT_PATHFINDING_RANGE("npc.default.pathfinding.range", "npc.pathfinding.default-range-blocks", 75F), - DEFAULT_RANDOM_LOOK_CLOSE("npc.default.look-close.random-look-enabled", false), - DEFAULT_RANDOM_LOOK_DELAY("npc.default.look-close.random-look-delay", "3s"), - DEFAULT_RANDOM_TALKER("npc.default.random-talker", "npc.default.talk-close.random-talker", false), - DEFAULT_REALISTIC_LOOKING("npc.default.realistic-looking", "npc.default.look-close.realistic-looking", false), - DEFAULT_SPAWN_NODAMAGE_DURATION("npc.default.spawn-nodamage-ticks", "npc.default.spawn-nodamage-duration", - "1s"), - DEFAULT_STATIONARY_DURATION("npc.default.stationary-ticks", "npc.default.stationary-duration", -1), - DEFAULT_STRAIGHT_LINE_TARGETING_DISTANCE("npc.pathfinding.straight-line-targeting-distance", 5), + DEFAULT_DISTANCE_MARGIN( + "The default MOVEMENT distance in blocks where the NPC will move to before considering a path finished
Note: this is different from the PATHFINDING distance which is specified by path-distance-margin", + "npc.pathfinding.default-distance-margin", 1), + DEFAULT_LOOK_CLOSE("Enable look close by default", "npc.default.look-close.enabled", false), + DEFAULT_LOOK_CLOSE_RANGE("Default look close range in blocks", "npc.default.look-close.range", 5), + DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT("Default distance between hologram lines", "npc.hologram.default-line-height", + 0.4D), + DEFAULT_NPC_LIMIT( + "Default maximum number of NPCs owned by a single player (give the citizens ignore-limits permission to skip this check)", + "npc.limits.default-limit", 10), + DEFAULT_PATH_DISTANCE_MARGIN( + "Default PATHFINDING distance in blocks where the NPC will consider pathfinding complete
Note: this is different from the MOVEMENT distance, which is specified by the distance-margin
Set to 0 if you want to try pathfind exactly to the target destination", + "npc.pathfinding.default-path-distance-margin", 1), + DEFAULT_PATHFINDER_UPDATE_PATH_RATE("How often to repathfind when targeting a dynamic target such as an entity", + "npc.pathfinding.update-path-rate", "1s"), + DEFAULT_PATHFINDING_RANGE( + "The default pathfinding range in blocks
Shouldn't be set too high to avoid lag - try pathfinding in sections instead", + "npc.default.pathfinding.range", "npc.pathfinding.default-range-blocks", 75F), + DEFAULT_RANDOM_LOOK_CLOSE("Default random look close enabled", "npc.default.look-close.random-look-enabled", + false), + DEFAULT_RANDOM_LOOK_DELAY("Default random look delay", "npc.default.look-close.random-look-delay", "3s"), + DEFAULT_RANDOM_TALKER("Default talk to nearby players", "npc.default.random-talker", + "npc.default.talk-close.random-talker", false), + DEFAULT_REALISTIC_LOOKING("Default to checking for line of sight when looking at players", + "npc.default.realistic-looking", "npc.default.look-close.realistic-looking", false), + DEFAULT_SPAWN_NODAMAGE_DURATION( + "Default duration of no-damage-ticks on entity spawn, Minecraft default is 20 ticks", + "npc.default.spawn-nodamage-ticks", "npc.default.spawn-nodamage-duration", "1s"), + DEFAULT_STATIONARY_DURATION( + "Default duration in the same location before the NPC considers itself stuck and failed pathfinding", + "npc.default.stationary-ticks", "npc.default.stationary-duration", -1), + DEFAULT_STRAIGHT_LINE_TARGETING_DISTANCE( + "The distance in blocks where the NPC will switch to walking straight towards the target instead of pathfinding
Currently only for dynamic targets like entities", + "npc.pathfinding.straight-line-targeting-distance", 5), DEFAULT_TALK_CLOSE("npc.default.talk-close.enabled", false), - DEFAULT_TALK_CLOSE_RANGE("npc.default.talk-close.range", 5), + DEFAULT_TALK_CLOSE_RANGE("Default talk close range in blocks", "npc.default.talk-close.range", 5), DEFAULT_TEXT("npc.default.talk-close.text.0", "Hi, I'm !") { @Override public void loadFromKey(DataKey root) { @@ -114,35 +151,57 @@ public class Settings { value = list; } }, - DEFAULT_TEXT_DELAY_MAX("npc.text.default-random-text-delay-max", "10s"), - DEFAULT_TEXT_DELAY_MIN("npc.text.default-random-text-delay-min", "5s"), - DEFAULT_TEXT_SPEECH_BUBBLE_DURATION("npc.text.speech-bubble-ticks", "npc.text.speech-bubble-duration", "50t"), - DISABLE_LOOKCLOSE_WHILE_NAVIGATING("npc.default.look-close.disable-while-navigating", true), - DISABLE_MC_NAVIGATION_FALLBACK("npc.pathfinding.disable-mc-fallback-navigation", true), - DISABLE_TABLIST("npc.tablist.disable", true), - ENTITY_SPAWN_WAIT_DURATION("general.entity-spawn-wait-ticks", "general.wait-for-entity-spawn", "1s"), + DEFAULT_TEXT_DELAY_MAX("Default maximum delay when talking to players", + "npc.text.default-random-text-delay-max", "10s"), + DEFAULT_TEXT_DELAY_MIN("Default minimum delay when talking to players", + "npc.text.default-random-text-delay-min", "5s"), + DEFAULT_TEXT_SPEECH_BUBBLE_DURATION("Default duration that speech bubbles show up for", + "npc.text.speech-bubble-ticks", "npc.text.speech-bubble-duration", "50t"), + DISABLE_LOOKCLOSE_WHILE_NAVIGATING("Whether to disable look close while pathfinding", + "npc.default.look-close.disable-while-navigating", true), + DISABLE_MC_NAVIGATION_FALLBACK( + "Minecraft will pick a 'close-enough' location when pathfinding to a block if it can't find a direct path
Disabled by default", + "npc.pathfinding.disable-mc-fallback-navigation", true), + DISABLE_TABLIST("Whether to remove NPCs from the tablist", "npc.tablist.disable", true), + ENTITY_SPAWN_WAIT_DURATION( + "Entities are no longer spawned until the chunks are loaded from disk
Wait for chunk loading for one second by default, increase if your disk is slow", + "general.entity-spawn-wait-ticks", "general.wait-for-entity-spawn", "1s"), ERROR_COLOUR("general.color-scheme.message-error", ""), - FOLLOW_ACROSS_WORLDS("npc.follow.teleport-across-worlds", true), + FOLLOW_ACROSS_WORLDS("Whether /npc follow will teleport across worlds to follow its target", + "npc.follow.teleport-across-worlds", true), HIGHLIGHT_COLOUR("general.color-scheme.message-highlight", "yellow"), - HOLOGRAM_UPDATE_RATE("npc.hologram.update-rate-ticks", "npc.hologram.update-rate", "1s"), - INITIAL_PLAYER_JOIN_SKIN_PACKET_DELAY("npc.skins.player-join-update-delay-ticks", - "npc.skins.player-join-update-delay", "3s"), - KEEP_CHUNKS_LOADED("npc.chunks.always-keep-loaded", false), - LOCALE("general.translation.locale", ""), - MAX_CONTROLLABLE_GROUND_SPEED("npc.controllable.max-ground-speed", 0.5), - MAX_NPC_LIMIT_CHECKS("npc.limits.max-permission-checks", 100), - MAX_NPC_SKIN_RETRIES("npc.skins.max-retries", -1), + HOLOGRAM_UPDATE_RATE("How often to update hologram names (including placeholders)", + "npc.hologram.update-rate-ticks", "npc.hologram.update-rate", "1s"), + INITIAL_PLAYER_JOIN_SKIN_PACKET_DELAY("How long to wait before sending skins to joined players", + "npc.skins.player-join-update-delay-ticks", "npc.skins.player-join-update-delay", "3s"), + KEEP_CHUNKS_LOADED("Whether to keep NPC chunks loaded", "npc.chunks.always-keep-loaded", false), + LOCALE("Controls translation files - defaults to your system language, set to en if English required", + "general.translation.locale", ""), + MAX_CONTROLLABLE_GROUND_SPEED("The maximum speed that controllable NPCs can reach, in Minecraft velocity units", + "npc.controllable.max-ground-speed", 0.5), + MAX_NPC_LIMIT_CHECKS( + "How many permissions to check when creating NPCs
Only change if you have a permission limit greater than this", + "npc.limits.max-permission-checks", 100), + MAX_NPC_SKIN_RETRIES( + "How many times to try load NPC skins (due to Minecraft rate-limiting skin requests, should rarely be less than 5", + "npc.skins.max-retries", -1), MAX_PACKET_ENTRIES("npc.limits.max-packet-entries", 15), - MAX_SPEED("npc.limits.max-speed", 100), - MAX_TEXT_RANGE("npc.chat.options.max-text-range", 500), - MAXIMUM_ASTAR_ITERATIONS("npc.pathfinding.maximum-new-pathfinder-iterations", - "npc.pathfinding.new-finder.maximum-iterations", 5000), - MAXIMUM_VISITED_NODES("npc.pathfinding.maximum-visited-nodes", "npc.pathfinding.maximum-visited-blocks", 768), + MAX_TEXT_RANGE("The maximum range in blocks for chatting", "npc.chat.options.max-text-range", 500), + MAXIMUM_ASTAR_ITERATIONS("The maximum number of blocks to check when pathfinding", + "npc.pathfinding.maximum-new-pathfinder-iterations", "npc.pathfinding.new-finder.maximum-iterations", + 768), + MAXIMUM_VISITED_NODES("The maximum number of blocks to check when MINECRAFT pathfinding", + "npc.pathfinding.maximum-visited-nodes", "npc.pathfinding.maximum-visited-blocks", 768), MESSAGE_COLOUR("general.color-scheme.message", ""), - NEW_PATHFINDER_CHECK_BOUNDING_BOXES("npc.pathfinding.new-finder.check-bounding-boxes", false), - NEW_PATHFINDER_OPENS_DOORS("npc.pathfinding.new-finder.open-doors", false), - NPC_ATTACK_DISTANCE("npc.pathfinding.attack-range", 1.75), - NPC_COMMAND_GLOBAL_COMMAND_COOLDOWN("npc.commands.global-delay-seconds", "npc.commands.global-cooldown", "1s"), + NEW_PATHFINDER_CHECK_BOUNDING_BOXES( + "Whether to check bounding boxes when pathfinding such as between fences, inside doors, or other half-blocks", + "npc.pathfinding.new-finder.check-bounding-boxes", false), + NEW_PATHFINDER_OPENS_DOORS("Whether to open doors while pathfinding (should close them as well)", + "npc.pathfinding.new-finder.open-doors", false), + NPC_ATTACK_DISTANCE("The range in blocks before attacking the target", "npc.pathfinding.attack-range", 1.75), + NPC_COMMAND_GLOBAL_COMMAND_COOLDOWN( + "The global cooldown before a command can be used again, must be in seconds", + "npc.commands.global-delay-seconds", "npc.commands.global-cooldown", "1s"), NPC_COMMAND_MAXIMUM_TIMES_USED_MESSAGE("npc.commands.error-messages.maximum-times-used", "You have reached the maximum number of uses ({0})."), NPC_COMMAND_MISSING_ITEM_MESSAGE("npc.commands.error-messages.missing-item", "Missing {1} {0}"), @@ -155,34 +214,47 @@ public class Settings { "Please wait for {minutes} minutes and {seconds_over} seconds."), NPC_COMMAND_ON_GLOBAL_COOLDOWN_MESSAGE("npc.commands.error-messages.on-global-cooldown", "Please wait for {minutes} minutes and {seconds_over} seconds."), - NPC_COST("economy.npc.cost", 100D), - NPC_SKIN_RETRY_DELAY("npc.skins.retry-delay", "5s"), + NPC_COST("The default cost to create an NPC", "economy.npc.cost", 100D), + NPC_SKIN_RETRY_DELAY("How long before retrying skin requests (typically due to Mojang rate limiting)", + "npc.skins.retry-delay", "5s"), NPC_SKIN_ROTATION_UPDATE_DEGREES("npc.skins.rotation-update-degrees", 90f), NPC_SKIN_USE_LATEST("npc.skins.use-latest-by-default", false), NPC_SKIN_VIEW_DISTANCE("npc.skins.view-distance", 100D), - NPC_WATER_SPEED_MODIFIER("npc.movement.water-speed-modifier", 1.15F), + NPC_WATER_SPEED_MODIFIER("Movement speed percentage increase while in water", + "npc.movement.water-speed-modifier", 1.15F), + PACKET_HOLOGRAMS("Use packet NPCs for name holograms (experimental)", "npc.use-packet-holograms", false), PACKET_UPDATE_DELAY("npc.packets.update-delay", 30), - PATHFINDER_FALL_DISTANCE("npc.pathfinding.allowed-fall-distance", -1), - PLACEHOLDER_SKIN_UPDATE_FREQUENCY("npc.skins.placeholder-update-frequency-ticks", - "npc.skins.placeholder-update-frequency", "5m"), + PATHFINDER_FALL_DISTANCE( + "The default allowed maximum fall distance when pathfinding, set to -1 to use the Minecraft value", + "npc.pathfinding.allowed-fall-distance", -1), + PLACEHOLDER_SKIN_UPDATE_FREQUENCY("How often to update placeholders", + "npc.skins.placeholder-update-frequency-ticks", "npc.skins.placeholder-update-frequency", "5m"), PLAYER_TELEPORT_DELAY("npc.delay-player-teleport-ticks", "npc.delay-player-teleport", -1), - REMOVE_PLAYERS_FROM_PLAYER_LIST("npc.player.remove-from-list", true), - RESOURCE_PACK_PATH("general.resource-pack-path", "plugins/Citizens/resourcepack"), - SAVE_TASK_DELAY("storage.save-task.delay", "1hr"), - SELECTION_ITEM("npc.selection.item", "stick"), + REMOVE_PLAYERS_FROM_PLAYER_LIST("Whether to remove NPCs from the Java list of players", + "npc.player.remove-from-list", true), + RESOURCE_PACK_PATH("The resource pack path to save resource packs to", "general.resource-pack-path", + "plugins/Citizens/resourcepack"), + SAVE_TASK_DELAY("How often to save NPCs to disk", "storage.save-task.delay", "1hr"), + SELECTION_ITEM("The default item in hand to select an NPC", "npc.selection.item", "stick"), SELECTION_MESSAGE("npc.selection.message", "Selected [[]] (ID [[]])."), - SERVER_OWNS_NPCS("npc.server-ownership", false), + SERVER_OWNS_NPCS("Whether the server owns NPCs rather than individual players", "npc.server-ownership", false), STORAGE_FILE("storage.file", "saves.yml"), - STORAGE_TYPE("storage.type", "yaml"), - SUBPLUGIN_FOLDER("subplugins.folder", "plugins"), - TABLIST_REMOVE_PACKET_DELAY("npc.tablist.remove-packet-delay", "1t"), - 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), - USE_NEW_PATHFINDER("npc.pathfinding.use-new-finder", false), + STORAGE_TYPE("Although technically Citizens can use NBT storage, it is not well tested and YAML is recommended", + "storage.type", "yaml"), + TABLIST_REMOVE_PACKET_DELAY("How long to wait before sending the tablist remove packet", + "npc.tablist.remove-packet-delay", "1t"), + TALK_CLOSE_TO_NPCS("Whether to talk to NPCs (and therefore bystanders) as well as players", + "npc.chat.options.talk-to-npcs", true), + TALK_ITEM("The item filter to talk with", "npc.text.talk-item", "*"), + USE_BOAT_CONTROLS("Whether to change vehicle direction with movement instead of strafe controls", + "npc.controllable.use-boat-controls", true), + USE_NEW_PATHFINDER( + "Whether to use the Citizens pathfinder instead of the Minecraft pathfinder
Much more flexible, but may have different performance characteristics", + "npc.pathfinding.use-new-finder", false), USE_SCOREBOARD_TEAMS("npc.scoreboard-teams.enable", true), WARN_ON_RELOAD("general.reload-warning-enabled", true); + protected String comments; private Duration duration; protected String migrate; protected String path; @@ -194,7 +266,18 @@ public class Settings { } Setting(String migrate, String path, Object value) { + if (migrate.contains(".")) { + this.migrate = migrate; + } else { + this.comments = migrate; + } + this.path = path; + this.value = value; + } + + Setting(String comments, String migrate, String path, Object value) { this.migrate = migrate; + this.comments = comments; this.path = path; this.value = value; } @@ -245,8 +328,13 @@ public class Settings { } protected void loadFromKey(DataKey root) { + if (root.keyExists(path)) { + ((YamlKey) root).getSection("").setComments(path, + comments == null ? null : Arrays.asList(comments.split("
"))); + } if (migrate != null && root.keyExists(migrate) && !root.keyExists(path)) { value = root.getRaw(migrate); + root.removeKey(migrate); } else { value = root.getRaw(path); } diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java index 9183d99c7..e53f6735e 100644 --- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java @@ -2935,8 +2935,6 @@ public class NPCCommands { permission = "citizens.npc.speed") public void speed(CommandContext args, CommandSender sender, NPC npc) throws CommandException { float newSpeed = (float) Math.abs(args.getDouble(1)); - if (newSpeed >= Setting.MAX_SPEED.asDouble()) - throw new CommandException(Messages.SPEED_MODIFIER_ABOVE_LIMIT); npc.getNavigator().getDefaultParameters().speedModifier(newSpeed); Messaging.sendTr(sender, Messages.SPEED_MODIFIER_SET, newSpeed); diff --git a/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java b/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java index 703a5cb05..02c7ce3d6 100644 --- a/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java @@ -11,6 +11,7 @@ import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.TraitName; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; +import net.citizensnpcs.util.NMS; @TraitName("boundingbox") public class BoundingBoxTrait extends Trait implements Supplier { @@ -31,15 +32,18 @@ public class BoundingBoxTrait extends Trait implements Supplier { public BoundingBox get() { Location location = npc.getEntity().getLocation(); if (function != null) { - return function.apply(getAdjustedBoundingBox()).add(location); + BoundingBox bb = function.apply(getAdjustedBoundingBox()); + NMS.setDimensions(npc.getEntity(), bb.toDimensions()); + return bb.add(location); } EntityDim dim = getAdjustedBoundingBox(); + NMS.setDimensions(npc.getEntity(), dim); return new BoundingBox(location.getX() - dim.width / 2, location.getY(), location.getZ() - dim.width / 2, location.getX() + dim.width / 2, location.getY() + dim.height, location.getZ() + dim.width / 2); } public EntityDim getAdjustedBoundingBox() { - EntityDim desired = base.clone(); + EntityDim desired = base; if (scale != -1) { desired = desired.mul(scale); } @@ -70,8 +74,8 @@ public class BoundingBoxTrait extends Trait implements Supplier { this.height = height; } - public void setScale(float s) { - this.scale = s; + public void setScale(float scale) { + this.scale = scale; } public void setWidth(float width) { diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java index fce5515cd..dc87fe51e 100644 --- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java @@ -89,6 +89,9 @@ public class HologramTrait extends Trait { private NPC createHologram(String line, double heightOffset) { NPC hologramNPC = registry.createNPC(EntityType.ARMOR_STAND, line); hologramNPC.getOrAddTrait(ArmorStandTrait.class).setAsHelperEntityWithName(npc); + if (Setting.PACKET_HOLOGRAMS.asBoolean()) { + hologramNPC.addTrait(PacketNPC.class); + } hologramNPC.spawn(currentLoc.clone().add(0, getEntityHeight() + (direction == HologramDirection.BOTTOM_UP ? heightOffset : getMaxHeight() - heightOffset), @@ -269,8 +272,7 @@ public class HologramTrait extends Trait { || currentLoc.distance(npc.getStoredLocation()) >= 0.001 || lastNameplateVisible != nameplateVisible || Math.abs(lastEntityHeight - getEntityHeight()) >= 0.05; boolean updateName = false; - if (t++ >= Setting.HOLOGRAM_UPDATE_RATE.asTicks() - + Util.getFastRandom().nextInt(3) /* add some jitter */) { + if (t++ >= Setting.HOLOGRAM_UPDATE_RATE.asTicks() + Util.getFastRandom().nextInt(3) /* add some jitter */) { t = 0; updateName = true; } diff --git a/main/src/main/java/net/citizensnpcs/util/Messages.java b/main/src/main/java/net/citizensnpcs/util/Messages.java index e1e499a6d..a25b8f310 100644 --- a/main/src/main/java/net/citizensnpcs/util/Messages.java +++ b/main/src/main/java/net/citizensnpcs/util/Messages.java @@ -106,7 +106,6 @@ public class Messages { public static final String ERROR_GETTING_FIELD = "citizens.nms-errors.getting-field"; public static final String ERROR_GETTING_ID_MAPPING = "citizens.nms-errors.getting-id-mapping"; public static final String ERROR_GETTING_METHOD = "citizens.nms-errors.getting-method"; - public static final String ERROR_INITALISING_SUB_PLUGIN = "citizens.sub-plugins.error-on-load"; public static final String ERROR_RESTORING_GOALS = "citizens.nms-errors.restoring-goals"; public static final String ERROR_SETTING_LOOKCLOSE_RANGE = "citizens.commands.npc.lookclose.error-random-range"; public static final String ERROR_SETTING_SKIN_URL = "citizens.commands.npc.skin.error-setting-url"; @@ -216,7 +215,6 @@ public class Messages { public static final String LOAD_TASK_NOT_SCHEDULED = "citizens.load-task-error"; public static final String LOAD_UNKNOWN_NPC_TYPE = "citizens.notifications.unknown-npc-type"; public static final String LOADED_ECONOMY = "citizens.economy.loaded"; - public static final String LOADING_SUB_PLUGIN = "citizens.sub-plugins.load"; public static final String LOCALE_NOTIFICATION = "citizens.notifications.locale"; public static final String LOOKCLOSE_DISABLE_WHEN_NAVIGATING = "citizens.commands.npc.lookclose.disable-when-navigating"; public static final String LOOKCLOSE_ENABLE_WHEN_NAVIGATING = "citizens.commands.npc.lookclose.enable-when-navigating"; diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index 2322a824c..f8481f8c3 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -39,7 +39,6 @@ import net.citizensnpcs.api.ai.NavigatorParameters; import net.citizensnpcs.api.astar.pathfinder.SwimmingExaminer; import net.citizensnpcs.api.command.CommandManager; import net.citizensnpcs.api.command.exception.CommandException; -import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.jnbt.CompoundTag; import net.citizensnpcs.api.npc.BlockBreaker; @@ -95,18 +94,6 @@ public class NMS { return BRIDGE.createPacketTracker(entity); } - public static void enderTeleportTo(NPC npc, Runnable cb) { - if (npc == null) { - cb.run(); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - cb.run(); - } - } - public static GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) throws Throwable { return BRIDGE.fillProfileProperties(profile, requireSecure); } @@ -518,10 +505,6 @@ public class NMS { .newInstance(); } - public static void loadPlugins() { - BRIDGE.loadPlugins(); - } - public static void look(Entity entity, float yaw, float pitch) { BRIDGE.look(entity, yaw, pitch); } diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java index d6d7aa89a..34b37f51b 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java +++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java @@ -119,8 +119,6 @@ public interface NMSBridge { public void load(CommandManager commands); - public void loadPlugins(); - public void look(Entity from, Entity to); public void look(Entity entity, float yaw, float pitch); diff --git a/main/src/main/java/net/citizensnpcs/util/Quaternion.java b/main/src/main/java/net/citizensnpcs/util/Quaternion.java index 39a276056..f1ba06352 100644 --- a/main/src/main/java/net/citizensnpcs/util/Quaternion.java +++ b/main/src/main/java/net/citizensnpcs/util/Quaternion.java @@ -80,6 +80,10 @@ public class Quaternion { c1c2 * c3 - s1s2 * s3); } + public static Quaternion fromEuler(EulerAngle angle) { + return fromEuler(angle.getX(), angle.getY(), angle.getZ()); + } + public static Quaternion nlerp(Quaternion a, Quaternion b, double t) { if (a.dot(b) < 0) { b = b.mul(-1); diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ArmorStandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java similarity index 94% rename from v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ArmorStandController.java rename to v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java index 2feadeed1..1cc69dff1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ArmorStandController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java @@ -1,134 +1,136 @@ -package net.citizensnpcs.nms.v1_10_R1.entity.nonliving; - -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_10_R1.CraftServer; -import org.bukkit.craftbukkit.v1_10_R1.entity.CraftArmorStand; -import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.util.Vector; - -import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_10_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl; -import net.citizensnpcs.npc.CitizensNPC; -import net.citizensnpcs.npc.ai.NPCHolder; -import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_10_R1.AxisAlignedBB; -import net.minecraft.server.v1_10_R1.EntityArmorStand; -import net.minecraft.server.v1_10_R1.EntityHuman; -import net.minecraft.server.v1_10_R1.EnumHand; -import net.minecraft.server.v1_10_R1.EnumInteractionResult; -import net.minecraft.server.v1_10_R1.ItemStack; -import net.minecraft.server.v1_10_R1.NBTTagCompound; -import net.minecraft.server.v1_10_R1.Vec3D; -import net.minecraft.server.v1_10_R1.World; - -public class ArmorStandController extends MobEntityController { - public ArmorStandController() { - super(EntityArmorStandNPC.class); - } - - @Override - public ArmorStand getBukkitEntity() { - return (ArmorStand) super.getBukkitEntity(); - } - - public static class ArmorStandNPC extends CraftArmorStand implements NPCHolder { - private final CitizensNPC npc; - - public ArmorStandNPC(EntityArmorStandNPC entity) { - super((CraftServer) Bukkit.getServer(), entity); - this.npc = entity.npc; - } - - @Override - public NPC getNPC() { - return npc; - } - } - - public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - private final CitizensNPC npc; - - public EntityArmorStandNPC(World world) { - this(world, null); - } - - public EntityArmorStandNPC(World world, NPC npc) { - super(world); - this.npc = (CitizensNPC) npc; - } - - @Override - public void a(AxisAlignedBB bb) { - super.a(NMSBoundingBox.makeBB(npc, bb)); - } - - @Override - public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, ItemStack itemstack, EnumHand enumhand) { - if (npc == null) { - return super.a(entityhuman, vec3d, itemstack, enumhand); - } - PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(), - getBukkitEntity()); - Bukkit.getPluginManager().callEvent(event); - return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; - } - - @Override - public void collide(net.minecraft.server.v1_10_R1.Entity entity) { - // this method is called by both the entities involved - cancelling - // it will not stop the NPC from moving. - super.collide(entity); - if (npc != null) { - Util.callCollisionEvent(npc, entity.getBukkitEntity()); - } - } - - @Override - public boolean d(NBTTagCompound save) { - return npc == null ? super.d(save) : false; - } - - @Override - public void g(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.g(vector.getX(), vector.getY(), vector.getZ()); - } - } - - @Override - public CraftEntity getBukkitEntity() { - if (npc != null && !(bukkitEntity instanceof NPCHolder)) { - bukkitEntity = new ArmorStandNPC(this); - } - return super.getBukkitEntity(); - } - - @Override - public NPC getNPC() { - return npc; - } - - @Override - public void m() { - super.m(); - if (npc != null) { - npc.update(); - } - } - - @Override - public void setSize(float f, float f1) { - if (npc == null) { - super.setSize(f, f1); - } else { - NMSImpl.setSize(this, f, f1, justCreated); - } - } - } +package net.citizensnpcs.nms.v1_10_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_10_R1.CraftServer; +import org.bukkit.craftbukkit.v1_10_R1.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerInteractEntityEvent; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_10_R1.AxisAlignedBB; +import net.minecraft.server.v1_10_R1.EntityArmorStand; +import net.minecraft.server.v1_10_R1.EntityHuman; +import net.minecraft.server.v1_10_R1.EnumHand; +import net.minecraft.server.v1_10_R1.EnumInteractionResult; +import net.minecraft.server.v1_10_R1.ItemStack; +import net.minecraft.server.v1_10_R1.NBTTagCompound; +import net.minecraft.server.v1_10_R1.Vec3D; +import net.minecraft.server.v1_10_R1.World; + +public class ArmorStandController extends MobEntityController { + public ArmorStandController() { + super(EntityArmorStandNPC.class); + } + + @Override + public ArmorStand getBukkitEntity() { + return (ArmorStand) super.getBukkitEntity(); + } + + public static class ArmorStandNPC extends CraftArmorStand implements NPCHolder { + private final CitizensNPC npc; + + public ArmorStandNPC(EntityArmorStandNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { + private final CitizensNPC npc; + + public EntityArmorStandNPC(World world) { + this(world, null); + } + + public EntityArmorStandNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void a(AxisAlignedBB bb) { + super.a(NMSBoundingBox.makeBB(npc, bb)); + } + + @Override + public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, ItemStack itemstack, EnumHand enumhand) { + if (npc == null) { + return super.a(entityhuman, vec3d, itemstack, enumhand); + } + PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(), + getBukkitEntity()); + Bukkit.getPluginManager().callEvent(event); + return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; + } + + @Override + public void collide(net.minecraft.server.v1_10_R1.Entity entity) { + // this method is called by both the entities involved - cancelling + // it will not stop the NPC from moving. + super.collide(entity); + if (npc != null) { + Util.callCollisionEvent(npc, entity.getBukkitEntity()); + } + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + + + @Override + public void g(double x, double y, double z) { + Vector vector = Util.callPushEvent(npc, x, y, z); + if (vector != null) { + super.g(vector.getX(), vector.getY(), vector.getZ()); + } + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ArmorStandNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void m() { + super.m(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } } \ No newline at end of file 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 f4e8e4ec7..86ae99916 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 @@ -101,10 +101,7 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 c15d86345..f7f326a92 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 @@ -98,10 +98,7 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 bf1f2c759..699e3df6d 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 @@ -114,10 +114,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 9872d81ed..80f12c4bf 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 @@ -123,10 +123,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 c43bdfb2f..8f6221d72 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 @@ -138,10 +138,7 @@ public class CowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 1b732c9ed..61367c8da 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 @@ -131,10 +131,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 fc04547eb..5b7eb0ceb 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 @@ -97,10 +97,7 @@ public class EnderDragonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 ed996e4ca..ba3df1966 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 @@ -113,10 +113,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 28b517c5e..9975a6a26 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 @@ -113,10 +113,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 27cadc13c..e1cba4169 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 @@ -20,7 +20,7 @@ import com.mojang.authlib.GameProfile; 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; @@ -172,16 +172,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) - super.enderTeleportTo(d0, d1, d2); - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public void g(double x, double y, double z) { 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 ef74154c6..74ad9679e 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 @@ -89,10 +89,7 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 357515f37..f9349a492 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 @@ -99,10 +99,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 d670ba725..2c526e3f3 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 @@ -100,10 +100,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 847916636..a5aef5329 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 @@ -128,10 +128,7 @@ public class HorseController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 180aa260b..dadb6a176 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 @@ -99,10 +99,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 578cbe45c..199aa1fb0 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 @@ -112,10 +112,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 9538d49fb..ef987aefd 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 @@ -118,10 +118,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 6bb3d8927..cd3b39890 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 @@ -115,10 +115,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 8b34b1048..2140176f7 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 @@ -118,10 +118,7 @@ public class PigController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 2e694c906..0e0f58176 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 @@ -99,10 +99,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 338247806..6ac6b20bc 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 @@ -93,10 +93,7 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 dfdf78abf..3387fae36 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 @@ -110,10 +110,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 c5aa21890..8e557ba6a 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 @@ -108,10 +108,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 e4ac76a5f..606199192 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 @@ -100,10 +100,7 @@ public class ShulkerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 6d7d5adaa..31d6084ad 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 @@ -99,10 +99,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 13db4ecce..54fe22d4e 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 @@ -99,10 +99,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 d1b5a7b47..cf6519430 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 @@ -113,10 +113,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 c4ad2714f..a4abdbad4 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 @@ -99,10 +99,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 aaa312b15..d1aec14c0 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 @@ -99,10 +99,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 9f62a6216..650f93263 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 @@ -99,10 +99,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 604fa5f29..43f32fc15 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 @@ -132,10 +132,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 116b6ac46..ded419391 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 @@ -99,10 +99,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 d4f00fce4..82d5a87f0 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 @@ -89,10 +89,7 @@ public class WitherController extends MobEntityController { : npc.data().get("wither-arrow-shield"); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 5feea0b44..146e9e8eb 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 @@ -111,10 +111,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 9cdc73f8e..baf579979 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 @@ -99,10 +99,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 a36f473d8..9bbef6949 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 @@ -52,7 +52,6 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -101,6 +100,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_10_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_10_R1.entity.BatController; import net.citizensnpcs.nms.v1_10_R1.entity.BlazeController; import net.citizensnpcs.nms.v1_10_R1.entity.CaveSpiderController; @@ -138,7 +138,6 @@ import net.citizensnpcs.nms.v1_10_R1.entity.WitherController; import net.citizensnpcs.nms.v1_10_R1.entity.WolfController; import net.citizensnpcs.nms.v1_10_R1.entity.ZombieController; import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_10_R1.entity.nonliving.EggController; @@ -777,11 +776,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE, ZombieController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ArmorStandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java similarity index 94% rename from v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ArmorStandController.java rename to v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java index f8c076b86..9c735d671 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ArmorStandController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java @@ -1,123 +1,125 @@ -package net.citizensnpcs.nms.v1_11_R1.entity.nonliving; - -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_11_R1.CraftServer; -import org.bukkit.craftbukkit.v1_11_R1.entity.CraftArmorStand; -import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.util.Vector; - -import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_11_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_11_R1.util.NMSBoundingBox; -import net.citizensnpcs.npc.CitizensNPC; -import net.citizensnpcs.npc.ai.NPCHolder; -import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_11_R1.AxisAlignedBB; -import net.minecraft.server.v1_11_R1.EntityArmorStand; -import net.minecraft.server.v1_11_R1.EntityHuman; -import net.minecraft.server.v1_11_R1.EnumHand; -import net.minecraft.server.v1_11_R1.EnumInteractionResult; -import net.minecraft.server.v1_11_R1.NBTTagCompound; -import net.minecraft.server.v1_11_R1.Vec3D; -import net.minecraft.server.v1_11_R1.World; - -public class ArmorStandController extends MobEntityController { - public ArmorStandController() { - super(EntityArmorStandNPC.class); - } - - @Override - public ArmorStand getBukkitEntity() { - return (ArmorStand) super.getBukkitEntity(); - } - - public static class ArmorStandNPC extends CraftArmorStand implements NPCHolder { - private final CitizensNPC npc; - - public ArmorStandNPC(EntityArmorStandNPC entity) { - super((CraftServer) Bukkit.getServer(), entity); - this.npc = entity.npc; - } - - @Override - public NPC getNPC() { - return npc; - } - } - - public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - private final CitizensNPC npc; - - public EntityArmorStandNPC(World world) { - this(world, null); - } - - public EntityArmorStandNPC(World world, NPC npc) { - super(world); - this.npc = (CitizensNPC) npc; - } - - @Override - public void a(AxisAlignedBB bb) { - super.a(NMSBoundingBox.makeBB(npc, bb)); - } - - @Override - public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) { - if (npc == null) { - return super.a(entityhuman, vec3d, enumhand); - } - PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(), - getBukkitEntity()); - Bukkit.getPluginManager().callEvent(event); - return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; - } - - @Override - public void A_() { - super.A_(); - if (npc != null) { - npc.update(); - } - } - - @Override - public void collide(net.minecraft.server.v1_11_R1.Entity entity) { - // this method is called by both the entities involved - cancelling - // it will not stop the NPC from moving. - super.collide(entity); - if (npc != null) { - Util.callCollisionEvent(npc, entity.getBukkitEntity()); - } - } - - @Override - public boolean d(NBTTagCompound save) { - return npc == null ? super.d(save) : false; - } - - @Override - public void f(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.f(vector.getX(), vector.getY(), vector.getZ()); - } - } - - @Override - public CraftEntity getBukkitEntity() { - if (npc != null && !(bukkitEntity instanceof NPCHolder)) { - bukkitEntity = new ArmorStandNPC(this); - } - return super.getBukkitEntity(); - } - - @Override - public NPC getNPC() { - return npc; - } - } +package net.citizensnpcs.nms.v1_11_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_11_R1.CraftServer; +import org.bukkit.craftbukkit.v1_11_R1.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerInteractEntityEvent; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_11_R1.util.NMSBoundingBox; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_11_R1.AxisAlignedBB; +import net.minecraft.server.v1_11_R1.EntityArmorStand; +import net.minecraft.server.v1_11_R1.EntityHuman; +import net.minecraft.server.v1_11_R1.EnumHand; +import net.minecraft.server.v1_11_R1.EnumInteractionResult; +import net.minecraft.server.v1_11_R1.NBTTagCompound; +import net.minecraft.server.v1_11_R1.Vec3D; +import net.minecraft.server.v1_11_R1.World; + +public class ArmorStandController extends MobEntityController { + public ArmorStandController() { + super(EntityArmorStandNPC.class); + } + + @Override + public ArmorStand getBukkitEntity() { + return (ArmorStand) super.getBukkitEntity(); + } + + public static class ArmorStandNPC extends CraftArmorStand implements NPCHolder { + private final CitizensNPC npc; + + public ArmorStandNPC(EntityArmorStandNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { + private final CitizensNPC npc; + + public EntityArmorStandNPC(World world) { + this(world, null); + } + + public EntityArmorStandNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void a(AxisAlignedBB bb) { + super.a(NMSBoundingBox.makeBB(npc, bb)); + } + + @Override + public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) { + if (npc == null) { + return super.a(entityhuman, vec3d, enumhand); + } + PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(), + getBukkitEntity()); + Bukkit.getPluginManager().callEvent(event); + return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; + } + + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void collide(net.minecraft.server.v1_11_R1.Entity entity) { + // this method is called by both the entities involved - cancelling + // it will not stop the NPC from moving. + super.collide(entity); + if (npc != null) { + Util.callCollisionEvent(npc, entity.getBukkitEntity()); + } + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + + + @Override + public void f(double x, double y, double z) { + Vector vector = Util.callPushEvent(npc, x, y, z); + if (vector != null) { + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ArmorStandNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } } \ No newline at end of file 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 923f6b1d6..b8a3aa81e 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 @@ -101,10 +101,7 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2528c7a67..2c765a1b6 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 @@ -98,10 +98,7 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f304fec30..987654b80 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 @@ -114,10 +114,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 bec7bded2..a0c2fd803 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 @@ -123,10 +123,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 cfef7cb6b..61774063f 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 @@ -138,10 +138,7 @@ public class CowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d69a7dca6..93eefd9ec 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 @@ -123,10 +123,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 bcd15c6d7..e94d55ad2 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 @@ -97,10 +97,7 @@ public class EnderDragonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d9ef94da8..540781917 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 @@ -113,10 +113,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a8c05cd49..6a6a16176 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 @@ -113,10 +113,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 252e632b1..1ebf5b053 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 @@ -20,7 +20,7 @@ import com.mojang.authlib.GameProfile; 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; @@ -186,16 +186,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) - super.enderTeleportTo(d0, d1, d2); - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public void f(double x, double y, double z) { 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 bd513bdfd..a304b28e9 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 @@ -100,10 +100,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 02ab8de67..d8e182729 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 @@ -89,10 +89,7 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 692cc97a1..abcdeeb64 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 @@ -99,10 +99,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 915d05031..969ba6c01 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 @@ -100,10 +100,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d37c1e810..1559ff015 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 @@ -100,10 +100,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 4f66177e3..08b55c2f3 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 @@ -120,10 +120,7 @@ public class HorseController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 53d87823b..9f87162a1 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 @@ -120,10 +120,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c30fff8dc..a979e5962 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 @@ -120,10 +120,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8fb80529c..f6d12993b 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 @@ -121,10 +121,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 0267197a1..180a718ff 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 @@ -121,10 +121,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 08579db8a..77f62d485 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 @@ -99,10 +99,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 fab25efc3..44dcc72f4 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 @@ -120,10 +120,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 af78c79d7..b972bf22f 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 @@ -120,10 +120,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 122a7b37b..3e382b6da 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 @@ -117,10 +117,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 315c9870b..15d23d6d6 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 @@ -115,10 +115,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d4912c5f3..39a531327 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 @@ -116,10 +116,7 @@ public class PigController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 67a0085e3..c4dc52151 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 @@ -99,10 +99,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b366ebc87..0dee1e15a 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 @@ -93,10 +93,7 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 7ad44f09e..4cee51a4b 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 @@ -110,10 +110,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 be44e5d68..93b751bb5 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 @@ -108,10 +108,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 fe204a72d..989894f6c 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 @@ -110,10 +110,7 @@ public class ShulkerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 67a24d944..0730425ae 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 @@ -99,10 +99,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9008560e1..a71c2efb3 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 @@ -99,10 +99,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 64e7cdd8b..b1e24b54f 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 @@ -99,10 +99,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 284ab964b..1888d46ce 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 @@ -99,10 +99,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 172381330..2b09fe564 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 @@ -121,10 +121,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 93a8d1797..181b44c62 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 @@ -99,10 +99,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d3bc22e7b..d339b3a8d 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 @@ -99,10 +99,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 79721aa3f..1e52427df 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 @@ -99,10 +99,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f4a0b8f7e..7fb41e91b 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 @@ -87,10 +87,7 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8d7b2034a..0b55f2e2e 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 @@ -138,10 +138,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 7e4392a41..96fa46148 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 @@ -109,10 +109,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 63e4afc88..186703ad3 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 @@ -99,10 +99,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1f5f29635..3dd3b1b68 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 @@ -89,10 +89,7 @@ public class WitherController extends MobEntityController { : npc.data().get("wither-arrow-shield"); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9cf304b70..66d0986dd 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 @@ -111,10 +111,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 3fae2c8a4..3a92316a6 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 @@ -99,10 +99,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 aab2e6550..49ecdc66f 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 @@ -99,10 +99,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 675028552..71182467d 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 @@ -99,10 +99,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 93e1d1217..48c02d458 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 @@ -52,7 +52,6 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -101,6 +100,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_11_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_11_R1.entity.BatController; import net.citizensnpcs.nms.v1_11_R1.entity.BlazeController; import net.citizensnpcs.nms.v1_11_R1.entity.CaveSpiderController; @@ -151,7 +151,6 @@ import net.citizensnpcs.nms.v1_11_R1.entity.ZombieController; import net.citizensnpcs.nms.v1_11_R1.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_11_R1.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_11_R1.entity.nonliving.EggController; @@ -831,11 +830,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ArmorStandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java similarity index 94% rename from v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ArmorStandController.java rename to v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java index c093af944..437b4be6f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ArmorStandController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java @@ -1,123 +1,122 @@ -package net.citizensnpcs.nms.v1_12_R1.entity.nonliving; - -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_12_R1.CraftServer; -import org.bukkit.craftbukkit.v1_12_R1.entity.CraftArmorStand; -import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; -import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.util.Vector; - -import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_12_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_12_R1.util.NMSBoundingBox; -import net.citizensnpcs.npc.CitizensNPC; -import net.citizensnpcs.npc.ai.NPCHolder; -import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_12_R1.AxisAlignedBB; -import net.minecraft.server.v1_12_R1.EntityArmorStand; -import net.minecraft.server.v1_12_R1.EntityHuman; -import net.minecraft.server.v1_12_R1.EnumHand; -import net.minecraft.server.v1_12_R1.EnumInteractionResult; -import net.minecraft.server.v1_12_R1.NBTTagCompound; -import net.minecraft.server.v1_12_R1.Vec3D; -import net.minecraft.server.v1_12_R1.World; - -public class ArmorStandController extends MobEntityController { - public ArmorStandController() { - super(EntityArmorStandNPC.class); - } - - @Override - public ArmorStand getBukkitEntity() { - return (ArmorStand) super.getBukkitEntity(); - } - - public static class ArmorStandNPC extends CraftArmorStand implements NPCHolder { - private final CitizensNPC npc; - - public ArmorStandNPC(EntityArmorStandNPC entity) { - super((CraftServer) Bukkit.getServer(), entity); - this.npc = entity.npc; - } - - @Override - public NPC getNPC() { - return npc; - } - } - - public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { - private final CitizensNPC npc; - - public EntityArmorStandNPC(World world) { - this(world, null); - } - - public EntityArmorStandNPC(World world, NPC npc) { - super(world); - this.npc = (CitizensNPC) npc; - } - - @Override - public void a(AxisAlignedBB bb) { - super.a(NMSBoundingBox.makeBB(npc, bb)); - } - - @Override - public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) { - if (npc == null) { - return super.a(entityhuman, vec3d, enumhand); - } - PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(), - getBukkitEntity()); - Bukkit.getPluginManager().callEvent(event); - return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; - } - - @Override - public void B_() { - super.B_(); - if (npc != null) { - npc.update(); - } - } - - @Override - public void collide(net.minecraft.server.v1_12_R1.Entity entity) { - // this method is called by both the entities involved - cancelling - // it will not stop the NPC from moving. - super.collide(entity); - if (npc != null) { - Util.callCollisionEvent(npc, entity.getBukkitEntity()); - } - } - - @Override - public boolean d(NBTTagCompound save) { - return npc == null ? super.d(save) : false; - } - - @Override - public void f(double x, double y, double z) { - Vector vector = Util.callPushEvent(npc, x, y, z); - if (vector != null) { - super.f(vector.getX(), vector.getY(), vector.getZ()); - } - } - - @Override - public CraftEntity getBukkitEntity() { - if (npc != null && !(bukkitEntity instanceof NPCHolder)) { - bukkitEntity = new ArmorStandNPC(this); - } - return super.getBukkitEntity(); - } - - @Override - public NPC getNPC() { - return npc; - } - } +package net.citizensnpcs.nms.v1_12_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerInteractEntityEvent; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_12_R1.util.NMSBoundingBox; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_12_R1.AxisAlignedBB; +import net.minecraft.server.v1_12_R1.EntityArmorStand; +import net.minecraft.server.v1_12_R1.EntityHuman; +import net.minecraft.server.v1_12_R1.EnumHand; +import net.minecraft.server.v1_12_R1.EnumInteractionResult; +import net.minecraft.server.v1_12_R1.NBTTagCompound; +import net.minecraft.server.v1_12_R1.Vec3D; +import net.minecraft.server.v1_12_R1.World; + +public class ArmorStandController extends MobEntityController { + public ArmorStandController() { + super(EntityArmorStandNPC.class); + } + + @Override + public ArmorStand getBukkitEntity() { + return (ArmorStand) super.getBukkitEntity(); + } + + public static class ArmorStandNPC extends CraftArmorStand implements NPCHolder { + private final CitizensNPC npc; + + public ArmorStandNPC(EntityArmorStandNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder { + private final CitizensNPC npc; + + public EntityArmorStandNPC(World world) { + this(world, null); + } + + public EntityArmorStandNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void a(AxisAlignedBB bb) { + super.a(NMSBoundingBox.makeBB(npc, bb)); + } + + @Override + public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) { + if (npc == null) { + return super.a(entityhuman, vec3d, enumhand); + } + PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(), + getBukkitEntity()); + Bukkit.getPluginManager().callEvent(event); + return event.isCancelled() ? EnumInteractionResult.FAIL : EnumInteractionResult.SUCCESS; + } + + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void collide(net.minecraft.server.v1_12_R1.Entity entity) { + // this method is called by both the entities involved - cancelling + // it will not stop the NPC from moving. + super.collide(entity); + if (npc != null) { + Util.callCollisionEvent(npc, entity.getBukkitEntity()); + } + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void f(double x, double y, double z) { + Vector vector = Util.callPushEvent(npc, x, y, z); + if (vector != null) { + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ArmorStandNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } } \ No newline at end of file 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 58ee376a5..b3d2674ec 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 @@ -102,10 +102,7 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 618096729..fc241ae92 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 @@ -99,10 +99,7 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 4a5f3b775..c2d191d31 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 @@ -124,10 +124,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 3d5f797d9..29bc45f4d 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 @@ -133,10 +133,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1941fee04..a050d7a69 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 @@ -148,10 +148,7 @@ public class CowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8ef87fc8e..3413a7796 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 @@ -133,10 +133,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 94c469464..834a4b668 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 @@ -98,10 +98,7 @@ public class EnderDragonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d39ea897c..a5c991d66 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 @@ -123,10 +123,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c8c3d69d8..b87b03aad 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 @@ -123,10 +123,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 7e4c9d751..11cfcbe3c 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 @@ -21,7 +21,7 @@ import com.mojang.authlib.GameProfile; 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; @@ -205,18 +205,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) { - super.enderTeleportTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public void f(double x, double y, double z) { 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 9ee4e086d..c73ce98b9 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 @@ -110,10 +110,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 eab4556f0..8b3845108 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 @@ -90,10 +90,7 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 299312703..3aae9e19e 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 @@ -109,10 +109,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6e96f76cd..08699a0b1 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 @@ -110,10 +110,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c1f142151..637433aeb 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 @@ -110,10 +110,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 713c7ffb8..b0ee9826d 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 @@ -144,10 +144,7 @@ public class HorseController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 409a8ccf2..2890d2da4 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 @@ -144,10 +144,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f680da87e..d4d3cec13 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 @@ -144,10 +144,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6d311eb95..530c5a344 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 @@ -145,10 +145,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 02afc7615..8579217ed 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 @@ -145,10 +145,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e3327214a..4e0566ae9 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 @@ -110,10 +110,7 @@ public class IllusionerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8caa73fb9..31d3d4e7d 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 @@ -109,10 +109,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 930313c3f..60843d825 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 @@ -130,10 +130,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 3d7982467..8b89f9f2a 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 @@ -130,10 +130,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2d980dddd..7914edd36 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 @@ -127,10 +127,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f9656632c..f014b1a68 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 @@ -126,10 +126,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 ec6d21e77..572d86b82 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 @@ -96,10 +96,7 @@ public class ParrotController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 171bb2132..ead492c42 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 @@ -126,10 +126,7 @@ public class PigController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8abeff6f5..f0f5c0d11 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 @@ -109,10 +109,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6e7034fc4..191726acd 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 @@ -94,10 +94,7 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9625eba01..4f1a02cc1 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 @@ -120,10 +120,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 02dd2bc64..66d28c5e5 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 @@ -118,10 +118,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d82fbdde2..3c17ba6d0 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 @@ -119,10 +119,7 @@ public class ShulkerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6bb08c019..c1eb6ca9c 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 @@ -109,10 +109,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8a583854c..57ef77351 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 @@ -109,10 +109,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 0cc7051e7..d787470ca 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 @@ -109,10 +109,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 cbd70604a..8d0f0d4a9 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 @@ -109,10 +109,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 cc6239b24..ffafa978f 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 @@ -131,10 +131,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 10084d819..2c077468f 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 @@ -109,10 +109,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 69af29a74..32d3fd7e7 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 @@ -109,10 +109,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9793ff732..3c8bf94dd 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 @@ -109,10 +109,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 97acb81cc..63f64991a 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 @@ -88,10 +88,7 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 0a00c576c..926543793 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 @@ -148,10 +148,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 21264cd91..6c19e88f3 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 @@ -119,10 +119,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 da22d2796..6b5fa007b 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 @@ -109,10 +109,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b30ff13a8..180638ab7 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 @@ -90,10 +90,7 @@ public class WitherController extends MobEntityController { : npc.data().get("wither-arrow-shield"); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 463c7dc23..2f75debda 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 @@ -121,10 +121,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c88d40768..e9374bed9 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 @@ -109,10 +109,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 653c3ccbb..6bc209785 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 @@ -109,10 +109,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 fee562abc..6f2276207 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 @@ -109,10 +109,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 958aec2cc..dcfa3a1e9 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 @@ -52,7 +52,6 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -101,6 +100,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_12_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_12_R1.entity.BatController; import net.citizensnpcs.nms.v1_12_R1.entity.BlazeController; import net.citizensnpcs.nms.v1_12_R1.entity.CaveSpiderController; @@ -153,7 +153,6 @@ import net.citizensnpcs.nms.v1_12_R1.entity.ZombieController; import net.citizensnpcs.nms.v1_12_R1.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_12_R1.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_12_R1.entity.nonliving.EggController; @@ -835,11 +834,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java similarity index 97% rename from v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java index e1532ef2b..629435fdd 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_13_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_13_R2.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_13_R2.CraftServer; @@ -10,7 +10,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_13_R2.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; 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 c6d2c52bf..1e2259042 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 @@ -116,10 +116,7 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 88fd90373..1910d16e4 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 @@ -113,10 +113,7 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 0796027c1..8f99da69b 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 @@ -138,10 +138,7 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 0c1bc152b..b6987229b 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 @@ -149,10 +149,7 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 fc662d90e..e988e63fd 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 @@ -158,10 +158,7 @@ public class CodController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 5ee259f45..5f9ceddfb 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 @@ -162,10 +162,7 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e030cb7fd..a5b7bd65f 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 @@ -147,10 +147,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 4cb54118b..139e3b6a0 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 @@ -152,10 +152,7 @@ public class DolphinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9cf624cbb..c52cb3759 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 @@ -137,10 +137,7 @@ public class DrownedController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f95063610..93c46195a 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 @@ -114,10 +114,7 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 115079be0..448d40fc4 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 @@ -137,10 +137,7 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 815cfc3e7..8d4d9ab67 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 @@ -137,10 +137,7 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6fc13fab5..0f04666f7 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 @@ -21,7 +21,7 @@ import com.mojang.authlib.GameProfile; 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; @@ -193,18 +193,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable }, 35); // give enough time for death and smoke animation } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) { - super.enderTeleportTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public void f(double x, double y, double z) { 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 eb66ad227..1c46e7b20 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 @@ -124,10 +124,7 @@ public class EvokerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2225fe025..e4a5afcf1 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 @@ -99,10 +99,7 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 89d12a315..91454a0f3 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 @@ -123,10 +123,7 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2462c1082..77ca53a66 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 @@ -126,10 +126,7 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 66b3746de..9647ffc8c 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 @@ -126,10 +126,7 @@ public class GuardianElderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b5342699a..637bf2a38 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 @@ -158,10 +158,7 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 3a31e8323..bbd1cb2b4 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 @@ -158,10 +158,7 @@ public class HorseDonkeyController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1dda9a14a..e9bd7f3e2 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 @@ -158,10 +158,7 @@ public class HorseMuleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 222f44adf..00f2879bb 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 @@ -159,10 +159,7 @@ public class HorseSkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e289cba45..4b710992d 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 @@ -159,10 +159,7 @@ public class HorseZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 348bc58de..6a7f69ecf 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 @@ -124,10 +124,7 @@ public class IllusionerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 25af05d3e..9ddb2aa32 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 @@ -123,10 +123,7 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2745cf8d2..62c7a079b 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 @@ -144,10 +144,7 @@ public class LlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 149332c3b..40d6e8b03 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 @@ -136,10 +136,7 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e0a19f3c2..543ef0fea 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 @@ -141,10 +141,7 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 898053812..1a20ed8ce 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 @@ -140,10 +140,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 3a41d767f..1559b226d 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 @@ -110,10 +110,7 @@ public class ParrotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2d2f98c92..8d13995ee 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 @@ -141,10 +141,7 @@ public class PhantomController extends MobEntityController { return false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 00c2cfa1d..d9808affb 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 @@ -140,10 +140,7 @@ public class PigController extends MobEntityController { return npc == null ? super.dh() : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 89bc14f17..8d2babfc3 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 @@ -123,10 +123,7 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 56d6527cb..f2dafa44d 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 @@ -108,10 +108,7 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c96e5e6b2..b98f91423 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 @@ -146,10 +146,7 @@ public class PufferFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 72fd171c3..9e2025f7c 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 @@ -134,10 +134,7 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 bafb8087f..9491578f2 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 @@ -144,10 +144,7 @@ public class SalmonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d57610bb7..fb21a279e 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 @@ -132,10 +132,7 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b4f8736da..b74a8166c 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 @@ -126,10 +126,7 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 ed2c861b8..b3f13b484 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 @@ -123,10 +123,7 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 dd16a7d88..02e4c62a2 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 @@ -123,10 +123,7 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 37e9b7c05..036d125e5 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 @@ -123,10 +123,7 @@ public class SkeletonStrayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a4c109eed..12d64eba2 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 @@ -123,10 +123,7 @@ public class SkeletonWitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a52b51903..3f849e390 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 @@ -137,10 +137,7 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 69972646b..ad2f5d93f 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 @@ -123,10 +123,7 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1b0e61c12..bad6f6a2f 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 @@ -123,10 +123,7 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 349463d81..6268e38e7 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 @@ -123,10 +123,7 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a2a360269..86d49f404 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 @@ -144,10 +144,7 @@ public class TropicalFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 97640adb4..07a4ddd5c 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 @@ -132,10 +132,7 @@ public class TurtleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a610f0369..94d6046d5 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 @@ -102,10 +102,7 @@ public class VexController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9e8a20ed7..c8132498e 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 @@ -162,10 +162,7 @@ public class VillagerController extends MobEntityController { return super.dB(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f9ef021e0..1f4077bb0 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 @@ -133,10 +133,7 @@ public class VindicatorController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 95f6f6815..b3b357a0d 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 @@ -123,10 +123,7 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1450146fe..342ca88ed 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 @@ -104,10 +104,7 @@ public class WitherController extends MobEntityController { : npc.data().get("wither-arrow-shield"); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d7a010523..e0cd46674 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 @@ -135,10 +135,7 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8800e4e43..33e0ceddf 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 @@ -123,10 +123,7 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 4c9e95545..1ecc6d389 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 @@ -123,10 +123,7 @@ public class ZombieHuskController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 67301c50e..6f683ff73 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 @@ -123,10 +123,7 @@ public class ZombieVillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.D(), NPC.Metadata.AMBIENT_SOUND); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1c6802126..3eeb86a01 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 @@ -53,7 +53,6 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -102,6 +101,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_13_R2.entity.ArmorStandController; import net.citizensnpcs.nms.v1_13_R2.entity.BatController; import net.citizensnpcs.nms.v1_13_R2.entity.BlazeController; import net.citizensnpcs.nms.v1_13_R2.entity.CaveSpiderController; @@ -162,7 +162,6 @@ import net.citizensnpcs.nms.v1_13_R2.entity.ZombieController; import net.citizensnpcs.nms.v1_13_R2.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_13_R2.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.EggController; @@ -877,11 +876,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java similarity index 97% rename from v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java rename to v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java index 2800b05b3..72f920a2b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ArmorStandController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_14_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_14_R1.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_14_R1.CraftServer; @@ -10,7 +10,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_14_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_14_R1.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; 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 acae7e0e0..0318f91bd 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 @@ -109,10 +109,7 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 97ec02ced..81a414778 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 @@ -106,10 +106,7 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a156a332f..af614582c 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 @@ -142,10 +142,7 @@ public class CatController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1096a7e71..c3f2dfafa 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 @@ -132,10 +132,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 926062666..77d89b5ff 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 @@ -142,10 +142,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 835deb8b3..002dc7318 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 @@ -152,10 +152,7 @@ public class CodController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b31ce6811..a5ba7e983 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 @@ -157,10 +157,7 @@ public class CowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 710c3d166..f7618e371 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 @@ -134,10 +134,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 03f80b32f..c8ef69d82 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 @@ -147,10 +147,7 @@ public class DolphinController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1224eb54a..9ff75113a 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 @@ -131,10 +131,7 @@ public class DrownedController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d5482b884..3c72a8813 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 @@ -106,10 +106,7 @@ public class EnderDragonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8edd3d77d..2c15a93a0 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 @@ -139,10 +139,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6543d4aa0..9fb4e8c96 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 @@ -131,10 +131,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6c7106cf6..efd97f2f7 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 @@ -20,7 +20,7 @@ import com.mojang.authlib.GameProfile; 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; @@ -182,18 +182,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) { - super.enderTeleportTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public void f(double x, double y, double z) { 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 eac5d70ab..e1171168c 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 @@ -118,10 +118,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e84de5fd7..b8b7e2f67 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 @@ -128,10 +128,7 @@ public class FoxController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 0eac9099f..fb84af96d 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 @@ -92,10 +92,7 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 37423a849..044fddd91 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 @@ -117,10 +117,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 84ee7e170..d82511746 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 @@ -118,10 +118,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 519479af9..301b39db6 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 @@ -118,10 +118,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 309227b8e..f8ecf1219 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 @@ -159,10 +159,7 @@ public class HorseController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8a90d61d5..7774a294f 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 @@ -158,10 +158,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c5ccff308..e457b752c 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 @@ -158,10 +158,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2ea209712..061558764 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 @@ -159,10 +159,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 cd62a8ce5..469470c5a 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 @@ -159,10 +159,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 704b7cea8..228628bcc 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 @@ -118,10 +118,7 @@ public class IllusionerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 8953cd7a5..d14a73d64 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 @@ -117,10 +117,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 97002e84d..30b5c175d 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 @@ -139,10 +139,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 559500543..d4c80fa58 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 @@ -123,10 +123,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 7dc90e9e8..776c52287 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 @@ -136,10 +136,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 80cf06ea1..1b6322e9a 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 @@ -135,10 +135,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 eded4483c..0b58c2903 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 @@ -128,10 +128,7 @@ public class PandaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 5c3ada6ef..7833b5ab7 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 @@ -103,10 +103,7 @@ public class ParrotController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 780e6e178..4311fb1f8 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 @@ -132,10 +132,7 @@ public class PhantomController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 ed134c829..950d111af 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 @@ -135,10 +135,7 @@ public class PigController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e8312834f..c8d878c49 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 @@ -117,10 +117,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6baa76f1d..24725c5a0 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 @@ -128,10 +128,7 @@ public class PillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a9c8806b8..5be2f013d 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 @@ -102,10 +102,7 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 7a6673ab0..db336a836 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 @@ -150,10 +150,7 @@ public class PufferFishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a4149aa1a..70c5c39f5 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 @@ -129,10 +129,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9a12f1875..c966fefe3 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 @@ -128,10 +128,7 @@ public class RavagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 1a78bf27b..6a587f699 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 @@ -138,10 +138,7 @@ public class SalmonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a968ba3ac..f21b9db65 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 @@ -127,10 +127,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b5d33cded..9d67ead2c 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 @@ -118,10 +118,7 @@ public class ShulkerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 bb189efa8..2788913eb 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 @@ -117,10 +117,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 a860b1028..ef4b80b02 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 @@ -117,10 +117,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e320c76fa..33fe59aad 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 @@ -117,10 +117,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 3df485623..4912041ec 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 @@ -117,10 +117,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 741177055..53e8ba01e 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 @@ -124,10 +124,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 6f601b902..41a9b689a 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 @@ -117,10 +117,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 c2f4e59f9..bb96b29d6 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 @@ -117,10 +117,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 4fd10f409..f05fca480 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 @@ -117,10 +117,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 5044cfb7a..6cc6df596 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 @@ -142,10 +142,7 @@ public class TraderLlamaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 9484b4533..2b26f3f07 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 @@ -138,10 +138,7 @@ public class TropicalFishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f38057999..316b30e82 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 @@ -126,10 +126,7 @@ public class TurtleController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 f8eed0c45..dad074397 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 @@ -95,10 +95,7 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 108511341..d1476e13d 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 @@ -161,10 +161,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 79a537f19..66d0b37d1 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 @@ -128,10 +128,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d8598f44a..6adb6b3ae 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 @@ -161,10 +161,7 @@ public class WanderingTraderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 b5aa04fcf..43a3c326e 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 @@ -117,10 +117,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 2dbd7d455..2c598a7a7 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 @@ -97,10 +97,7 @@ public class WitherController extends MobEntityController { : npc.data().get("wither-arrow-shield"); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 06ede4a4c..f03772fa0 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 @@ -130,10 +130,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 d4909b1d2..be35c96c0 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 @@ -117,10 +117,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 dcdc8d66b..c107741aa 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 @@ -117,10 +117,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e7dddbe9f..ccb813c72 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 @@ -117,10 +117,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void f(double x, double y, double z) { 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 e9f26636a..305aa8495 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 @@ -51,7 +51,6 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -100,6 +99,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_14_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_14_R1.entity.BatController; import net.citizensnpcs.nms.v1_14_R1.entity.BlazeController; import net.citizensnpcs.nms.v1_14_R1.entity.CatController; @@ -167,7 +167,6 @@ import net.citizensnpcs.nms.v1_14_R1.entity.ZombieController; import net.citizensnpcs.nms.v1_14_R1.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_14_R1.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_14_R1.entity.nonliving.EggController; @@ -938,11 +937,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java similarity index 97% rename from v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java rename to v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java index 75abb23a4..7e82d8bdc 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ArmorStandController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_15_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_15_R1.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_15_R1.CraftServer; @@ -10,7 +10,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_15_R1.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_15_R1.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl; 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 4f3917d97..d012662cc 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 @@ -102,10 +102,7 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 b28ed53c8..a94ea02f4 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 @@ -99,10 +99,7 @@ public class BeeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 a8e9aba02..76b97f453 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 @@ -99,10 +99,7 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 d51fd2532..e5d72d69d 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 @@ -136,10 +136,7 @@ public class CatController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 800fa7783..926e674e9 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 @@ -126,10 +126,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 946d44ca7..631ffb66a 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 @@ -136,10 +136,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 0e9877f44..35a882579 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 @@ -150,10 +150,7 @@ public class CodController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 49188fd8a..5936f4f78 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 @@ -151,10 +151,7 @@ public class CowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 6a0851de4..eeed0c502 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 @@ -128,10 +128,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 bbf0f7242..7b04590ae 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 @@ -144,10 +144,7 @@ public class DolphinController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 489c30a82..5262aed4c 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 @@ -125,10 +125,7 @@ public class DrownedController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 341abb132..4915a0bed 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 @@ -99,10 +99,7 @@ public class EnderDragonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 886d458ef..badc737b8 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 @@ -133,10 +133,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 8c9cd9283..9fe06fabe 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 @@ -125,10 +125,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 b3e0e4ba1..cd10f9081 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 @@ -19,7 +19,7 @@ import com.mojang.authlib.GameProfile; 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; @@ -182,18 +182,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) { - super.enderTeleportTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public CraftPlayer getBukkitEntity() { 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 b3cb68756..ea202e206 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 @@ -120,10 +120,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 a865004b6..da5ef7afd 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 @@ -130,10 +130,7 @@ public class FoxController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 0833ba1dc..0dc753d76 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 @@ -93,10 +93,7 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 c5b2d2ff2..083233cb5 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 @@ -119,10 +119,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 011e1e9a0..4c2fc935f 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 @@ -120,10 +120,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 1054b402a..e4b713a8c 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 @@ -120,10 +120,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 44862280f..4843fbe96 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 @@ -161,10 +161,7 @@ public class HorseController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 414e8603a..87e34e965 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 @@ -160,10 +160,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 658b41e98..0e780a4b2 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 @@ -160,10 +160,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 521d8f338..09f4d2e61 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 @@ -161,10 +161,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 a644942a7..371bd41ed 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 @@ -161,10 +161,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 ec5fad73d..b46445704 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 @@ -120,10 +120,7 @@ public class IllusionerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 347cf103f..a4bde57ff 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 @@ -119,10 +119,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 e196c6430..871595bd6 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 @@ -141,10 +141,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 f0707ac87..2424c8b47 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 @@ -129,10 +129,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 5840f81d0..1ef483ff4 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 @@ -138,10 +138,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 9b46ca40f..f645d9a29 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 @@ -131,10 +131,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 a3881c7e4..9ca78e19f 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 @@ -130,10 +130,7 @@ public class PandaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 f44f80e2c..efc57f8ea 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 @@ -104,10 +104,7 @@ public class ParrotController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 ba8aea2ac..330d0d017 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 @@ -139,10 +139,7 @@ public class PhantomController extends MobEntityController { return false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 646daf7a9..5d112dd8d 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 @@ -137,10 +137,7 @@ public class PigController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 ceb3e0cd4..396039fd4 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 @@ -119,10 +119,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 e1be401c5..6e17a1424 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 @@ -130,10 +130,7 @@ public class PillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 affa3b4d0..2f2fa3a73 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 @@ -103,10 +103,7 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 3a6062e18..53dc46a4d 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 @@ -156,10 +156,7 @@ public class PufferFishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 b02b2686b..562aff97d 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 @@ -131,10 +131,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 478fec1c1..ce9ccd005 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 @@ -130,10 +130,7 @@ public class RavagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 806327bd7..8444caeae 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 @@ -144,10 +144,7 @@ public class SalmonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 4a45360a9..bd7522c47 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 @@ -129,10 +129,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 862844a44..0334970da 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 @@ -120,10 +120,7 @@ public class ShulkerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 337d51a1d..06af9f523 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 @@ -119,10 +119,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 269d66652..437b9479f 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 @@ -119,10 +119,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 f1cae2071..0389f36ca 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 @@ -119,10 +119,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 673c57981..24745a2a8 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 @@ -119,10 +119,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 2acd82cb3..f4b8d133a 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 @@ -130,10 +130,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 a2952a58f..c9f0e4587 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 @@ -119,10 +119,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 d3647fa64..b2a27b415 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 @@ -119,10 +119,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 6b91fdc27..7ef64bd2e 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 @@ -119,10 +119,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 9f98dfdc5..47f8460b5 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 @@ -144,10 +144,7 @@ public class TraderLlamaController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 2a54a8c01..7be9b3fb3 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 @@ -144,10 +144,7 @@ public class TropicalFishController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 c64db3439..2319c3eb8 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 @@ -134,10 +134,7 @@ public class TurtleController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 ec3719ac5..e2f76b0c5 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 @@ -96,10 +96,7 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 c48c5a42b..6644f4768 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 @@ -154,10 +154,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean et() { 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 990e79bbc..cd40d7099 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 @@ -130,10 +130,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 e27500675..1f3196108 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 @@ -152,10 +152,7 @@ public class WanderingTraderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean et() { 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 23d13efe1..6ff7e4e2d 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 @@ -118,10 +118,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 eeb15f5be..9aa12a8a5 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 @@ -92,10 +92,7 @@ public class WitherController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 9b7654369..58bab8035 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 @@ -132,10 +132,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 d8f314973..0bd71bbcb 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 @@ -119,10 +119,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 17018fdc5..d88581517 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 @@ -119,10 +119,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 3230ff1ea..1d2cd7d5b 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 @@ -119,10 +119,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 5a51c78ff..c1d89fa07 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 @@ -51,7 +51,6 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -100,6 +99,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_15_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_15_R1.entity.BatController; import net.citizensnpcs.nms.v1_15_R1.entity.BeeController; import net.citizensnpcs.nms.v1_15_R1.entity.BlazeController; @@ -168,7 +168,6 @@ import net.citizensnpcs.nms.v1_15_R1.entity.ZombieController; import net.citizensnpcs.nms.v1_15_R1.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_15_R1.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_15_R1.entity.nonliving.EggController; @@ -955,11 +954,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java similarity index 97% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java rename to v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java index 5c6787bf7..2f020d3d0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R3.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_16_R3.CraftServer; @@ -10,7 +10,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R3.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_16_R3.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; 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 30e4024ec..41dc9317e 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 @@ -102,10 +102,7 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 3c43bdf49..79b3363f5 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 @@ -99,10 +99,7 @@ public class BeeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 05aceea7d..0586ed2a8 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 @@ -99,10 +99,7 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 eec1addca..b5c1a8bf1 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 @@ -127,10 +127,7 @@ public class CatController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 5165963e6..1aecbd667 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 @@ -117,10 +117,7 @@ public class CaveSpiderController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 89b1663e9..f0065e1d2 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 @@ -127,10 +127,7 @@ public class ChickenController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 29a70689f..95c115274 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 @@ -140,10 +140,7 @@ public class CodController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 125a09b1c..29fc749a9 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 @@ -143,10 +143,7 @@ public class CowController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 755d62ea0..a385e3b21 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 @@ -120,10 +120,7 @@ public class CreeperController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 a1848ac28..3dee8e7fa 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 @@ -133,10 +133,7 @@ public class DolphinController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 781c76d44..f2ff5def5 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 @@ -116,10 +116,7 @@ public class DrownedController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 5bf6f7dca..4d007544b 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 @@ -99,10 +99,7 @@ public class EnderDragonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 e1dbcfc01..59e5bc89a 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 @@ -124,10 +124,7 @@ public class EndermanController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 68691acb9..1299248a7 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 @@ -116,10 +116,7 @@ public class EndermiteController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 ed489242c..a28bd2094 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 @@ -24,7 +24,7 @@ import com.mojang.datafixers.util.Pair; 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; @@ -186,18 +186,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable }, 15); // give enough time for death and smoke animation } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) { - super.enderTeleportTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } + @Override public void g(Vec3D vec3d) { 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 4f814cfd7..c3077c505 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 @@ -111,10 +111,7 @@ public class EvokerController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 89b5a4f85..412502654 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 @@ -121,10 +121,7 @@ public class FoxController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 0dfa3f676..e0a1ff88e 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 @@ -93,10 +93,7 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 e5e7925aa..31e5eab1f 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 @@ -110,10 +110,7 @@ public class GiantController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 5a1a38f04..ac4cff6fc 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 @@ -111,10 +111,7 @@ public class GuardianController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 e14602f3e..3b7474a1a 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 @@ -111,10 +111,7 @@ public class GuardianElderController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 14ce15af0..221ffe37a 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 @@ -110,10 +110,7 @@ public class HoglinController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 cc988115e..f84542442 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 @@ -147,10 +147,7 @@ public class HorseController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean er() { 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 20ac56783..c5b0c8026 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 @@ -146,10 +146,7 @@ public class HorseDonkeyController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean er() { 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 c6e611c62..0c6c2fd8e 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 @@ -146,10 +146,7 @@ public class HorseMuleController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean er() { 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 c7b73bf73..d3aafc4c0 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 @@ -147,10 +147,7 @@ public class HorseSkeletonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean er() { 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 b19f6db4f..1b09d0aae 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 @@ -147,10 +147,7 @@ public class HorseZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean er() { 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 6f525cef8..3ca63d313 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 @@ -111,10 +111,7 @@ public class IllusionerController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 6e544e6fc..da2aba0b0 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 @@ -110,10 +110,7 @@ public class IronGolemController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 930dd6626..2a336ec66 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 @@ -132,10 +132,7 @@ public class LlamaController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 413f44d11..0fa7f9136 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 @@ -120,10 +120,7 @@ public class MagmaCubeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 06eaa7b9d..bde3c2122 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 @@ -130,10 +130,7 @@ public class MushroomCowController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 b9e34e0d6..4b8f67b66 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 @@ -122,10 +122,7 @@ public class OcelotController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 be15620f9..77530ae8f 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 @@ -121,10 +121,7 @@ public class PandaController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 be9087d02..74bf38442 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 @@ -105,10 +105,7 @@ public class ParrotController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 dfcb7b730..d389fe10d 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 @@ -140,10 +140,7 @@ public class PhantomController extends MobEntityController { return false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 0fc1786bd..a03761628 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 @@ -123,10 +123,7 @@ public class PigController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public boolean er() { 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 220d612bd..e8317be57 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 @@ -110,10 +110,7 @@ public class PigZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 b1b85f991..4a6ca1deb 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 @@ -110,10 +110,7 @@ public class PiglinBruteController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 2522632b3..d9155bb2d 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 @@ -110,10 +110,7 @@ public class PiglinController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 7c52fc18b..bd620657c 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 @@ -121,10 +121,7 @@ public class PillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 dc5f9584b..36a3b746b 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 @@ -103,10 +103,7 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 16bbcece8..c030f336f 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 @@ -146,10 +146,7 @@ public class PufferFishController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 b20f020df..bd8c882c4 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 @@ -122,10 +122,7 @@ public class RabbitController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 97b43c697..23040c0ae 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 @@ -121,10 +121,7 @@ public class RavagerController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 a5493615c..64b405ece 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 @@ -134,10 +134,7 @@ public class SalmonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 c42bc84c5..d58d9b07d 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 @@ -120,10 +120,7 @@ public class SheepController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 7fba7eb72..6f42ebdd3 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 @@ -111,10 +111,7 @@ public class ShulkerController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 8a85beb77..ff28e1d52 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 @@ -110,10 +110,7 @@ public class SilverfishController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 1be742e8e..63bbcf52b 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 @@ -110,10 +110,7 @@ public class SkeletonController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 978e25113..99f4abaae 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 @@ -110,10 +110,7 @@ public class SkeletonStrayController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 dcc58720e..d16fca267 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 @@ -110,10 +110,7 @@ public class SkeletonWitherController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 d1235e492..90f457372 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 @@ -121,10 +121,7 @@ public class SlimeController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 b7472ded0..5d16b4ea7 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 @@ -110,10 +110,7 @@ public class SnowmanController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 84057f633..22b6d88e0 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 @@ -110,10 +110,7 @@ public class SpiderController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 3e11432f5..1a27689a1 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 @@ -110,10 +110,7 @@ public class SquidController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 422403fbd..0f72ea261 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 @@ -110,10 +110,7 @@ public class StriderController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 0534970b4..aa277d230 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 @@ -135,10 +135,7 @@ public class TraderLlamaController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 fef1ec01f..1f2a2296e 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 @@ -134,10 +134,7 @@ public class TropicalFishController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 74f0bdfc3..f04f29646 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 @@ -123,10 +123,7 @@ public class TurtleController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 421679bb3..e9fd0b97f 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 @@ -96,10 +96,7 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 b754a8f61..8aa31d902 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 @@ -156,10 +156,7 @@ public class VillagerController extends MobEntityController { return super.eN(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 d9d0b850d..d3ad50ae4 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 @@ -121,10 +121,7 @@ public class VindicatorController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 c06bad5b9..d968ecd59 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 @@ -154,10 +154,7 @@ public class WanderingTraderController extends MobEntityController { return super.eN(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 1db163590..388171095 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 @@ -110,10 +110,7 @@ public class WitchController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 8a5ed3201..7695043ff 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 @@ -92,10 +92,7 @@ public class WitherController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public CraftEntity getBukkitEntity() { 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 e5faac7da..e9ad8bdd3 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 @@ -123,10 +123,7 @@ public class WolfController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 e5af9c5ce..faa5e521d 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 @@ -110,10 +110,7 @@ public class ZoglinController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 e906a8a31..10d4eb9bb 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 @@ -110,10 +110,7 @@ public class ZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 9d4a94b20..1707af95b 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 @@ -110,10 +110,7 @@ public class ZombieHuskController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 60be6f8be..9639782e8 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 @@ -110,10 +110,7 @@ public class ZombieVillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(Vec3D vec3d) { 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 e71ebe82b..2c7ef39cf 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 @@ -52,7 +52,6 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -101,6 +100,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_16_R3.entity.ArmorStandController; import net.citizensnpcs.nms.v1_16_R3.entity.BatController; import net.citizensnpcs.nms.v1_16_R3.entity.BeeController; import net.citizensnpcs.nms.v1_16_R3.entity.BlazeController; @@ -174,7 +174,6 @@ import net.citizensnpcs.nms.v1_16_R3.entity.ZombieController; import net.citizensnpcs.nms.v1_16_R3.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_16_R3.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.EggController; @@ -979,11 +978,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java similarity index 97% rename from v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java rename to v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java index 6aeabc60d..a96927dc8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ArmorStandController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_17_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_17_R1.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; @@ -8,7 +8,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_17_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_17_R1.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_17_R1.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_17_R1.util.NMSImpl; 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 5809c8fac..fb9566e67 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 @@ -107,10 +107,7 @@ public class AxolotlController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c9fe4a2da..05d3a097c 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 @@ -86,10 +86,7 @@ public class BatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 66e26d4de..4b04f0777 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 @@ -83,10 +83,7 @@ public class BeeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 f08de5143..5d75ba14b 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 @@ -78,10 +78,7 @@ public class BlazeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 9fa4c5e80..a1b033559 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 @@ -98,10 +98,7 @@ public class CatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 fcb4e0e38..d7be3d7a4 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 @@ -97,10 +97,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2999cac96..a72795431 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 @@ -106,10 +106,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 de4203dea..bf31d3bec 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 @@ -133,10 +133,7 @@ public class CodController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c3359cbf0..bb28a8100 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 @@ -103,10 +103,7 @@ public class CowController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c92d5cac4..1106d8081 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 @@ -101,10 +101,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 44777f003..9b6306dfb 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 @@ -100,10 +100,7 @@ public class DolphinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 20759e2e2..b0b365c85 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 @@ -97,10 +97,7 @@ public class DrownedController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2f8b3dead..7847115c2 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 @@ -95,10 +95,7 @@ public class EnderDragonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 74b303c59..7ca131141 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 @@ -104,10 +104,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 42db5a509..2346a9e21 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 @@ -97,10 +97,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 cc48acb09..01a03249c 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 @@ -24,7 +24,7 @@ import com.mojang.datafixers.util.Pair; 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; @@ -149,18 +149,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable }, 15); // give enough time for death and smoke animation } - @Override - public void dismountTo(double d0, double d1, double d2) { - if (npc == null) { - super.dismountTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.dismountTo(d0, d1, d2); - } - } + @Override public void doTick() { 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 0515fc375..08d168621 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 @@ -91,10 +91,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 64879fb0c..19ae52db9 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 @@ -92,10 +92,7 @@ public class FoxController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 8076cac85..df69cff2d 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 @@ -73,10 +73,7 @@ public class GhastController extends MobEntityController { super.customServerAiStep(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 96ca7e678..1255c974c 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 @@ -91,10 +91,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e35ca3798..8f0a2b98a 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 @@ -91,10 +91,7 @@ public class GlowSquidController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a89688d81..1043a25f6 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 @@ -92,10 +92,7 @@ public class GoatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 059fc0379..2b4606c67 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 @@ -97,10 +97,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 de42d03f2..d9bd7709d 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 @@ -97,10 +97,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7b75a9bd5..5f57faecf 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 @@ -94,10 +94,7 @@ public class HoglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a7619dbf7..0684e9218 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 @@ -130,10 +130,7 @@ public class HorseController extends MobEntityController { npc.update(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 cbe586768..83ee98736 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 @@ -130,10 +130,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 611fe3d1b..04a053e06 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 @@ -130,10 +130,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 eeea0defb..07dfab38d 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 @@ -130,10 +130,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2819f08f8..729c851d4 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 @@ -130,10 +130,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 5ba48e0c4..9f2aca4f2 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 @@ -91,10 +91,7 @@ public class IllusionerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 1969fa177..8531b6239 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 @@ -91,10 +91,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 41d0c29f8..d1d6e3b84 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 @@ -109,10 +109,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 1de8b1d8b..025594706 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 @@ -92,10 +92,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0c0ffcb5e..dff3f07f5 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 @@ -95,10 +95,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 dc7a9d84b..f9a85879b 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 @@ -98,10 +98,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0fc579da6..67794f71b 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 @@ -92,10 +92,7 @@ public class PandaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 72468331f..e0255ba28 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 @@ -82,10 +82,7 @@ public class ParrotController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 6f473ee75..6bbeda3fe 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 @@ -116,10 +116,7 @@ public class PhantomController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 ca51e9daa..be0c817e1 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 @@ -100,10 +100,7 @@ public class PigController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 caf991c02..9f1fe0c2d 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 @@ -91,10 +91,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 fdc4d80a0..ca1fda064 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 @@ -94,10 +94,7 @@ public class PiglinBruteController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e6134941b..e19e33a66 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 @@ -94,10 +94,7 @@ public class PiglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 bcaf25530..2e734ad61 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 @@ -92,10 +92,7 @@ public class PillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7c98493e9..d253e9b3f 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 @@ -74,10 +74,7 @@ public class PolarBearController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 50cc30e74..d2c921153 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 @@ -128,10 +128,7 @@ public class PufferFishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 46ef90d9a..a1cba785f 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 @@ -96,10 +96,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 465eddd8d..e134aa812 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 @@ -92,10 +92,7 @@ public class RavagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 045b4fd45..e5eb95c3d 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 @@ -125,10 +125,7 @@ public class SalmonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 90c351334..b45335373 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 @@ -92,10 +92,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2e2947e44..2fb54e420 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 @@ -95,10 +95,7 @@ public class ShulkerController extends MobEntityController { return new BodyRotationControl(this); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e594b556c..c506c1388 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 @@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftSilverfish; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.NPCEnderTeleportEvent; + import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_17_R1.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_17_R1.util.NMSBoundingBox; @@ -92,16 +92,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - if (npc == null) - super.dismountTo(d0, d1, d2); - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.dismountTo(d0, d1, d2); - } - } + @Override protected SoundEvent getAmbientSound() { 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 e2678ed80..9404e1b70 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 @@ -91,10 +91,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 dcb18b6e3..48b82e2b1 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 @@ -91,10 +91,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 8bafb8269..4ed5fcdb9 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 @@ -91,10 +91,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 93fe787da..5d27ed944 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 @@ -92,10 +92,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 5cec89024..706d62d38 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 @@ -91,10 +91,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7ace02339..9d5e10da5 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 @@ -91,10 +91,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0999ccb7c..f3c96b1f4 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 @@ -91,10 +91,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e3bddeebe..19aa8232d 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 @@ -91,10 +91,7 @@ public class StriderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 01dd330e1..2049b3651 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 @@ -110,10 +110,7 @@ public class TraderLlamaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 39fca3cbc..9ff933b16 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 @@ -127,10 +127,7 @@ public class TropicalFishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 1e6dc0e7e..63db10c59 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 @@ -112,10 +112,7 @@ public class TurtleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2a0a0178d..58e5c5dce 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 @@ -76,10 +76,7 @@ public class VexController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 f3d9993fa..b33da7867 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 @@ -106,10 +106,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 15844d8ca..5cd52399d 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 @@ -92,10 +92,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 9b5c9f62c..23a51b0d3 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 @@ -104,10 +104,7 @@ public class WanderingTraderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 3afcb479a..6d0aca217 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 @@ -91,10 +91,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 61896ae03..83c19fad0 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 @@ -77,10 +77,7 @@ public class WitherController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public int getAlternativeTarget(int i) { 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 46664de82..5804150e8 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 @@ -94,10 +94,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a6fca6a15..165dce9ab 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 @@ -93,10 +93,7 @@ public class ZoglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 02a4a264d..c7e185a54 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 @@ -91,10 +91,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a70915829..c1ab70e0a 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 @@ -91,10 +91,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 774512821..c42bbcd47 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 @@ -91,10 +91,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 528e9eb2c..24d93d379 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 @@ -49,7 +49,6 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -98,6 +97,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_17_R1.entity.ArmorStandController; import net.citizensnpcs.nms.v1_17_R1.entity.AxolotlController; import net.citizensnpcs.nms.v1_17_R1.entity.BatController; import net.citizensnpcs.nms.v1_17_R1.entity.BeeController; @@ -174,7 +174,6 @@ import net.citizensnpcs.nms.v1_17_R1.entity.ZombieController; import net.citizensnpcs.nms.v1_17_R1.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_17_R1.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_17_R1.entity.nonliving.EggController; @@ -981,11 +980,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java similarity index 97% rename from v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java rename to v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java index 9e89bb8c9..842a5223e 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ArmorStandController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_18_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_18_R2.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_18_R2.CraftServer; @@ -8,7 +8,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_18_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_18_R2.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_18_R2.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_18_R2.util.NMSImpl; 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 22fea07c8..d23c58791 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 @@ -107,10 +107,7 @@ public class AxolotlController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 9cfc0a6b5..ec874a7ec 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 @@ -88,10 +88,7 @@ public class BatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 11d6161d0..121d11899 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 @@ -85,10 +85,7 @@ public class BeeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 38f54351a..0799e1585 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 @@ -80,10 +80,7 @@ public class BlazeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 cf9bf2877..d418a5315 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 @@ -99,10 +99,7 @@ public class CatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 61d8b8d4e..8dae943b6 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 @@ -98,10 +98,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 ed0076970..bd4103b2e 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 @@ -107,10 +107,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 425554852..14a6211c4 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 @@ -134,10 +134,7 @@ public class CodController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 07e3cdd3a..2d74c5c83 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 @@ -104,10 +104,7 @@ public class CowController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6edced57a..b9ce859e2 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 @@ -101,10 +101,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 15329faf8..ed1c30af4 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 @@ -100,10 +100,7 @@ public class DolphinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 bf19ad463..4e45c93fc 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 @@ -98,10 +98,7 @@ public class DrownedController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2941061b2..87c3f0d2b 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 @@ -97,10 +97,7 @@ public class EnderDragonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c4bb5ee03..3fed72b08 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 @@ -101,10 +101,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 71bd73b8d..29e5ed877 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 @@ -98,10 +98,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c1b4a7ba6..e93a3c9be 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 @@ -25,7 +25,7 @@ import com.mojang.datafixers.util.Pair; 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; @@ -150,18 +150,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable }, 15); // give enough time for death and smoke animation } - @Override - public void dismountTo(double d0, double d1, double d2) { - if (npc == null) { - super.dismountTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.dismountTo(d0, d1, d2); - } - } + @Override public void doTick() { 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 69933957f..d06864790 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 @@ -92,10 +92,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 4474d070a..50e5922c6 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 @@ -93,10 +93,7 @@ public class FoxController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 20a7c6238..1b1ecca37 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 @@ -75,10 +75,7 @@ public class GhastController extends MobEntityController { super.customServerAiStep(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 9954b75d1..67c47df6a 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 @@ -92,10 +92,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 3778a3150..d2e481920 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 @@ -92,10 +92,7 @@ public class GlowSquidController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 d16c04694..63fa0988a 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 @@ -93,10 +93,7 @@ public class GoatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a1a903ba1..fc79aad10 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 @@ -98,10 +98,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2546a6de9..87111596b 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 @@ -98,10 +98,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e6a3d345c..0851ce275 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 @@ -95,10 +95,7 @@ public class HoglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 55cfee253..442266002 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 @@ -131,10 +131,7 @@ public class HorseController extends MobEntityController { npc.update(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 52264fa04..ab16a549d 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 @@ -131,10 +131,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 8679863ee..9f6ffaa16 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 @@ -131,10 +131,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 faafe46b9..44f5ebf55 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 @@ -131,10 +131,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6942b026a..bfa2116e4 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 @@ -131,10 +131,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 b94597b49..1a20bb9e7 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 @@ -92,10 +92,7 @@ public class IllusionerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 ec8f8ebd9..feb2ecd40 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 @@ -92,10 +92,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2d73d5391..036a88b40 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 @@ -110,10 +110,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a31f91d39..304c54f05 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 @@ -93,10 +93,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 9c6d8ef15..616b7b96d 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 @@ -96,10 +96,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a4f169398..b63931512 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 @@ -99,10 +99,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0ecce2f39..5e72f14ae 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 @@ -93,10 +93,7 @@ public class PandaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 3fae597bf..abc763d2c 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 @@ -84,10 +84,7 @@ public class ParrotController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 639386d94..291f8741a 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 @@ -117,10 +117,7 @@ public class PhantomController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 89529f525..eea108ae0 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 @@ -100,10 +100,7 @@ public class PigController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 4f2932726..4dc8871b1 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 @@ -92,10 +92,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c57aefa56..face9e8ad 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 @@ -95,10 +95,7 @@ public class PiglinBruteController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 cd9a525d2..a900cb1e2 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 @@ -95,10 +95,7 @@ public class PiglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 767bd02ae..848a24e36 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 @@ -93,10 +93,7 @@ public class PillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 02dae1f7d..912bac7f3 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 @@ -76,10 +76,7 @@ public class PolarBearController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 791462296..264afb20e 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 @@ -129,10 +129,7 @@ public class PufferFishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 57952ab19..cb58668f8 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 @@ -97,10 +97,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 63c9d7e6c..0671393cf 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 @@ -98,10 +98,7 @@ public class RavagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a1ee5647f..1d3f271e0 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 @@ -126,10 +126,7 @@ public class SalmonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 59ce54e10..90c46e2c2 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 @@ -93,10 +93,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 abd9712d1..1c681002a 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 @@ -96,10 +96,7 @@ public class ShulkerController extends MobEntityController { return new BodyRotationControl(this); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2c5c527fd..8af6d89fd 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 @@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_18_R2.entity.CraftSilverfish; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.NPCEnderTeleportEvent; + import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_18_R2.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_18_R2.util.NMSBoundingBox; @@ -93,16 +93,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - if (npc == null) - super.dismountTo(d0, d1, d2); - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.dismountTo(d0, d1, d2); - } - } + @Override protected SoundEvent getAmbientSound() { 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 0b5b5e946..ca5705b5b 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 @@ -92,10 +92,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 422db79e8..f9153c14e 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 @@ -92,10 +92,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 8697e1119..e18c27fce 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 @@ -92,10 +92,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 b0eb86b33..78419cffa 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 @@ -93,10 +93,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 15c9de4d6..e94192d85 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 @@ -92,10 +92,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 013be773d..d5ca693f2 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 @@ -92,10 +92,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a3864b13d..df9332bb8 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 @@ -92,10 +92,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 d925508e6..cbe12a17c 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 @@ -92,10 +92,7 @@ public class StriderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 dd9e44cf2..fe1b30554 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 @@ -111,10 +111,7 @@ public class TraderLlamaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 64140b1c2..791430193 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 @@ -128,10 +128,7 @@ public class TropicalFishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 ed9b3bc69..7e81f9d84 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 @@ -113,10 +113,7 @@ public class TurtleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2a589811f..48d8b4a30 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 @@ -78,10 +78,7 @@ public class VexController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 1816fab59..0402643c1 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 @@ -106,10 +106,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 095e6315c..b8c2f0088 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 @@ -93,10 +93,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e37e2fe5a..60c3d2753 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 @@ -104,10 +104,7 @@ public class WanderingTraderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 f2eda4751..d2d1bf7e6 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 @@ -92,10 +92,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 5174302ce..51ec454f5 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 @@ -79,10 +79,7 @@ public class WitherController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public int getAlternativeTarget(int i) { 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 f18663896..6345c2f3b 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 @@ -95,10 +95,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0dfb60aaf..7176ae997 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 @@ -94,10 +94,7 @@ public class ZoglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 11f4af5f6..44a0aa9bb 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 @@ -92,10 +92,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 03e0b9056..6e8b7830c 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 @@ -92,10 +92,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0427f083e..962dfc501 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 @@ -92,10 +92,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 3d7621b57..fbb77dd93 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 @@ -49,7 +49,6 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -99,6 +98,7 @@ import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_18_R2.entity.ArmorStandController; import net.citizensnpcs.nms.v1_18_R2.entity.AxolotlController; import net.citizensnpcs.nms.v1_18_R2.entity.BatController; import net.citizensnpcs.nms.v1_18_R2.entity.BeeController; @@ -175,7 +175,6 @@ import net.citizensnpcs.nms.v1_18_R2.entity.ZombieController; import net.citizensnpcs.nms.v1_18_R2.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_18_R2.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.DragonFireballController; import net.citizensnpcs.nms.v1_18_R2.entity.nonliving.EggController; @@ -986,11 +985,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); 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 e9096c689..8ea53c8de 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 @@ -110,11 +110,6 @@ public class AllayController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } - @Override protected SoundEvent getAmbientSound() { return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); diff --git a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ArmorStandController.java similarity index 97% rename from v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ArmorStandController.java index c45bc4925..3c4f3a59a 100644 --- a/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_19_R2.CraftServer; @@ -8,7 +8,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_19_R2.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; 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 f18d6c9ad..47df5821f 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 @@ -108,10 +108,7 @@ public class AxolotlController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 39837fbf1..403d842c8 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 @@ -88,11 +88,6 @@ public class BatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } - @Override public SoundEvent getAmbientSound() { return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); 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 346d7cba5..983bc2dce 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 @@ -85,10 +85,7 @@ public class BeeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 06e15023b..d71d039a6 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 @@ -80,10 +80,7 @@ public class BlazeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 fcbca3490..e23a6a4f0 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 @@ -117,10 +117,7 @@ public class CamelController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 8c9ebd9f8..6686318df 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 @@ -100,10 +100,7 @@ public class CatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7317e4a72..5597a5ea4 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 @@ -99,10 +99,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 fea59f561..7b55b3b69 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 @@ -108,10 +108,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 44cceb5d9..750dac1e3 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 @@ -135,10 +135,7 @@ public class CodController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 08167ffa7..b23dfe1f4 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 @@ -105,10 +105,7 @@ public class CowController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a8b9dfad2..d3f2590e8 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 @@ -102,10 +102,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 339f9e506..900c27250 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 @@ -101,10 +101,7 @@ public class DolphinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7159f5349..6546d4628 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 @@ -99,10 +99,7 @@ public class DrownedController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 74f9a8ecf..3d243ae36 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 @@ -97,10 +97,7 @@ public class EnderDragonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 5017beb13..8f98f6d46 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 @@ -102,10 +102,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0bf83ad9b..2ae991583 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 @@ -99,10 +99,7 @@ public class EndermiteController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 92d2b6ec2..00fbdad1b 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 @@ -24,7 +24,7 @@ import com.mojang.datafixers.util.Pair; import net.citizensnpcs.Settings.Setting; 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; @@ -144,18 +144,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable }, 15); // give enough time for death and smoke animation } - @Override - public void dismountTo(double d0, double d1, double d2) { - if (npc == null) { - super.dismountTo(d0, d1, d2); - return; - } - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.dismountTo(d0, d1, d2); - } - } + @Override public void doTick() { 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 132a0739f..a06f44140 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 @@ -93,10 +93,7 @@ public class EvokerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 205c65a56..b5806720e 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 @@ -94,10 +94,7 @@ public class FoxController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 68d466624..99f524b10 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 @@ -97,10 +97,7 @@ public class FrogController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 f4cf3da10..8f8c7cd58 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 @@ -75,10 +75,7 @@ public class GhastController extends MobEntityController { super.customServerAiStep(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 312959b46..886fff391 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 @@ -93,10 +93,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6d81d26ef..6e1817c2f 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 @@ -93,10 +93,7 @@ public class GlowSquidController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 315b1db3f..ff5266dcc 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 @@ -94,10 +94,7 @@ public class GoatController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 9a92d6110..b381606fb 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 @@ -99,10 +99,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 3930ff3a5..b0bd8ad82 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 @@ -99,10 +99,7 @@ public class GuardianElderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 1cc6366c0..8e68f0c48 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 @@ -99,10 +99,7 @@ public class HoglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 4347c1d48..22622db55 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 @@ -127,10 +127,7 @@ public class HorseController extends MobEntityController { npc.update(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 598a3c346..837d15e9f 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 @@ -127,10 +127,7 @@ public class HorseDonkeyController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 3d5ffa19e..7a4a3b838 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 @@ -127,10 +127,7 @@ public class HorseMuleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e99d7b16a..73a2e92de 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 @@ -127,10 +127,7 @@ public class HorseSkeletonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2595790a2..a07864bcb 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 @@ -127,10 +127,7 @@ public class HorseZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 ff8f0833b..58a7338e0 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 @@ -93,10 +93,7 @@ public class IllusionerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6f04e5b07..9840bcf81 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 @@ -93,10 +93,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6d58afe34..5aa0d8c61 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 @@ -111,10 +111,7 @@ public class LlamaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 85a61969e..84c995b8d 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 @@ -94,10 +94,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 ef36d8d80..b6cab6cf4 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 @@ -97,10 +97,7 @@ public class MushroomCowController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6bf07730b..ecd2fada4 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 @@ -100,10 +100,7 @@ public class OcelotController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 b18806c44..fc69d318e 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 @@ -94,10 +94,7 @@ public class PandaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 5b136370f..d22c822da 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 @@ -84,10 +84,7 @@ public class ParrotController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 09e5be67c..0cd01b3bb 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 @@ -118,10 +118,7 @@ public class PhantomController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6cf649865..92ce75308 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 @@ -95,10 +95,7 @@ public class PigController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7000d8249..65906262f 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 @@ -93,10 +93,7 @@ public class PigZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 68f53538f..8aade1360 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 @@ -96,10 +96,7 @@ public class PiglinBruteController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 d2181e0b9..327d8cde7 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 @@ -96,10 +96,7 @@ public class PiglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c1ca65f0e..a6e13a81a 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 @@ -94,10 +94,7 @@ public class PillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 da27d9db4..5179e3ba6 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 @@ -76,10 +76,7 @@ public class PolarBearController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 2627aa8d3..5026835aa 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 @@ -130,10 +130,7 @@ public class PufferFishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 cccb389ce..49a314780 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 @@ -98,10 +98,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 173378d4f..34cab7905 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 @@ -94,10 +94,7 @@ public class RavagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0c5ebc3f9..f1a775db7 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 @@ -127,10 +127,7 @@ public class SalmonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 3c2951c82..476be96f8 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 @@ -94,10 +94,7 @@ public class SheepController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 5ac465bc2..ec9290fa3 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 @@ -97,10 +97,7 @@ public class ShulkerController extends MobEntityController { return new BodyRotationControl(this); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 49bfaddb9..b2fd86bf9 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 @@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSilverfish; import org.bukkit.util.Vector; -import net.citizensnpcs.api.event.NPCEnderTeleportEvent; + import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_19_R2.util.NMSBoundingBox; @@ -94,16 +94,7 @@ public class SilverfishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - if (npc == null) - super.dismountTo(d0, d1, d2); - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.dismountTo(d0, d1, d2); - } - } + @Override protected SoundEvent getAmbientSound() { 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 08c9a07c1..11b863c6f 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 @@ -93,10 +93,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7f615158a..5674372fd 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 @@ -93,10 +93,7 @@ public class SkeletonStrayController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 b458b3325..d7ca379a3 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 @@ -93,10 +93,7 @@ public class SkeletonWitherController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e71cc56ca..54864d68d 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 @@ -94,10 +94,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 bf6592e0e..4cd8575f2 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 @@ -93,10 +93,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 0e1d7028d..eac71958b 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 @@ -93,10 +93,7 @@ public class SpiderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 dfe4d7ddb..af567c44a 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 @@ -93,10 +93,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 57af53e2e..849412bf3 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 @@ -93,10 +93,7 @@ public class StriderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 7c7aa447e..a35e0e0d6 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 @@ -127,10 +127,7 @@ public class TadpoleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 4f8c577f2..cbf3e5a66 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 @@ -112,10 +112,7 @@ public class TraderLlamaController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a79d6f784..7114e2da5 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 @@ -129,10 +129,7 @@ public class TropicalFishController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 d03ef3c42..45d95603e 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 @@ -114,10 +114,7 @@ public class TurtleController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 bc21a6828..ac55a8632 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 @@ -78,10 +78,7 @@ public class VexController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 502e84de8..3474023b6 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 @@ -107,10 +107,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 f24d1797a..98449618c 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 @@ -94,10 +94,7 @@ public class VindicatorController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 25e2d7f70..7325ca003 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 @@ -105,10 +105,7 @@ public class WanderingTraderController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 a3705db83..81b82f4be 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 @@ -102,10 +102,7 @@ public class WardenController extends MobEntityController { npc.update(); } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 6626a8405..d7c622e79 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 @@ -93,10 +93,7 @@ public class WitchController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 d4280d117..82b2c58c3 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 @@ -79,10 +79,7 @@ public class WitherController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public int getAlternativeTarget(int i) { 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 8e49deabf..bbf516265 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 @@ -96,10 +96,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 758710e26..882f46285 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 @@ -95,10 +95,7 @@ public class ZoglinController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 4050c3243..d2a8be59b 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 @@ -93,10 +93,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 e33d90b61..d0dabb23b 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 @@ -93,10 +93,7 @@ public class ZombieHuskController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override protected SoundEvent getAmbientSound() { 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 c8b206c8b..ead4915ea 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 @@ -93,10 +93,7 @@ public class ZombieVillagerController extends MobEntityController { } } - @Override - public void dismountTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.dismountTo(d0, d1, d2)); - } + @Override public SoundEvent getAmbientSound() { 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 52b6181e4..0b744d6e0 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 @@ -50,7 +50,6 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -103,6 +102,7 @@ import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.nms.v1_19_R2.entity.AllayController; +import net.citizensnpcs.nms.v1_19_R2.entity.ArmorStandController; import net.citizensnpcs.nms.v1_19_R2.entity.AxolotlController; import net.citizensnpcs.nms.v1_19_R2.entity.BatController; import net.citizensnpcs.nms.v1_19_R2.entity.BeeController; @@ -183,7 +183,6 @@ import net.citizensnpcs.nms.v1_19_R2.entity.ZombieController; import net.citizensnpcs.nms.v1_19_R2.entity.ZombieHuskController; import net.citizensnpcs.nms.v1_19_R2.entity.ZombieVillagerController; import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ChestBoatController; import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.DragonFireballController; @@ -1022,11 +1021,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArmorStandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java similarity index 97% rename from v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArmorStandController.java rename to v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java index 89e3cb902..31fb003d3 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArmorStandController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_8_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_8_R3.entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_8_R3.CraftServer; @@ -10,11 +10,11 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_8_R3.entity.MobEntityController; import net.citizensnpcs.nms.v1_8_R3.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.server.v1_8_R3.AxisAlignedBB; import net.minecraft.server.v1_8_R3.EntityArmorStand; @@ -90,6 +90,8 @@ public class ArmorStandController extends MobEntityController { return npc == null ? super.d(save) : false; } + + @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); 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 7e144940a..8c8b6e0fa 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 @@ -122,10 +122,7 @@ public class BatController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 e80f7ec11..db436b10e 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 @@ -116,10 +116,7 @@ public class BlazeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 88f897940..b82b6eedd 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 @@ -133,10 +133,7 @@ public class CaveSpiderController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 69d4d2098..32d2dd6ba 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 @@ -142,10 +142,7 @@ public class ChickenController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 78720667e..0e7ae8d1e 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 @@ -157,10 +157,7 @@ public class CowController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 7ee92452b..3d3014959 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 @@ -149,10 +149,7 @@ public class CreeperController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 17e168a91..6240184ab 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 @@ -108,10 +108,7 @@ public class EnderDragonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 73bb3f5d6..fec180e8f 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 @@ -132,10 +132,7 @@ public class EndermanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 b20f5e7cd..d39f866c5 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 @@ -131,10 +131,7 @@ public class EndermiteController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 507259819..9991e4d1b 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 @@ -19,7 +19,6 @@ import com.mojang.authlib.GameProfile; 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; @@ -161,17 +160,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - if (npc == null) - super.enderTeleportTo(d0, d1, d2); - NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc); - Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) { - super.enderTeleportTo(d0, d1, d2); - } - } - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); 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 d73fb11b5..3338fed6d 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 @@ -108,10 +108,7 @@ public class GhastController extends MobEntityController { super.E(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 0fa023eb0..344739553 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 @@ -118,10 +118,7 @@ public class GiantController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 3f88e2208..58f5e70a5 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 @@ -111,10 +111,7 @@ public class GuardianController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 6db8cf066..2f59b2aab 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 @@ -149,10 +149,7 @@ public class HorseController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 300b3e5db..6dc6a2daf 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 @@ -118,10 +118,7 @@ public class IronGolemController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 6c179cb08..f82eeca74 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 @@ -123,10 +123,7 @@ public class MagmaCubeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 fbc17d684..d67c8bd30 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 @@ -134,10 +134,7 @@ public class MushroomCowController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 9954ad912..02a3cf85b 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 @@ -133,10 +133,7 @@ public class OcelotController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 8e1301b02..ea7686c88 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 @@ -137,10 +137,7 @@ public class PigController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 53c9fa300..b31eb0378 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 @@ -117,10 +117,7 @@ public class PigZombieController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 6ab0bbc97..585aa8a2d 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 @@ -132,10 +132,7 @@ public class RabbitController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 bb897c31d..b012a5464 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 @@ -126,10 +126,7 @@ public class SheepController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 91532bed1..bdbdcd1f4 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 @@ -117,10 +117,7 @@ public class SilverfishController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 08018e111..4d3ece522 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 @@ -118,10 +118,7 @@ public class SkeletonController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 f8475ff8a..54b04b544 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 @@ -124,10 +124,7 @@ public class SlimeController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 83ca355d6..2210c54b4 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 @@ -118,10 +118,7 @@ public class SnowmanController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 7521465c1..583b91707 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 @@ -117,10 +117,7 @@ public class SpiderController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 f7ab6997c..6c1999171 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 @@ -110,10 +110,7 @@ public class SquidController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 ae17162df..3f3e6ffce 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 @@ -149,10 +149,7 @@ public class VillagerController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 344b0348d..7bcf63c2a 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 @@ -117,10 +117,7 @@ public class WitchController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 e43b4e72b..6e7630bcf 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 @@ -109,10 +109,7 @@ public class WitherController extends MobEntityController { npc.update(); } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 94d768142..a17c6e84a 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 @@ -130,10 +130,7 @@ public class WolfController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 982e7215c..36e88b6ee 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 @@ -118,10 +118,7 @@ public class ZombieController extends MobEntityController { } } - @Override - public void enderTeleportTo(double d0, double d1, double d2) { - NMS.enderTeleportTo(npc, () -> super.enderTeleportTo(d0, d1, d2)); - } + @Override public void g(double x, double y, double z) { 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 4f04f83d7..a0ab26314 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 @@ -49,7 +49,6 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.SkullMeta; -import org.bukkit.plugin.PluginLoadOrder; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -96,6 +95,7 @@ import net.citizensnpcs.api.npc.NPCRegistry; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_8_R3.entity.ArmorStandController; import net.citizensnpcs.nms.v1_8_R3.entity.BatController; import net.citizensnpcs.nms.v1_8_R3.entity.BlazeController; import net.citizensnpcs.nms.v1_8_R3.entity.CaveSpiderController; @@ -130,7 +130,6 @@ import net.citizensnpcs.nms.v1_8_R3.entity.WitchController; import net.citizensnpcs.nms.v1_8_R3.entity.WitherController; import net.citizensnpcs.nms.v1_8_R3.entity.WolfController; import net.citizensnpcs.nms.v1_8_R3.entity.ZombieController; -import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.ArmorStandController; import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.ArrowController; import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.BoatController; import net.citizensnpcs.nms.v1_8_R3.entity.nonliving.EggController; @@ -713,11 +712,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE, ZombieController.class); } - @Override - public void loadPlugins() { - ((CraftServer) Bukkit.getServer()).enablePlugins(PluginLoadOrder.POSTWORLD); - } - @Override public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) { Entity handle = NMSImpl.getHandle(entity);