From dfb5b90b383cb54f03eeb228f18062d23a8c065f Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 19 Jul 2018 20:18:47 +0800 Subject: [PATCH] Preliminary 1.13 update - some known issues --- main/pom.xml | 6 +- .../java/net/citizensnpcs/EventListen.java | 4 +- .../citizensnpcs/commands/NPCCommands.java | 8 +- .../citizensnpcs/editor/EndermanEquipper.java | 55 +- .../citizensnpcs/editor/GenericEquipper.java | 97 +- .../citizensnpcs/editor/SheepEquipper.java | 3 +- .../npc/CitizensTraitFactory.java | 41 +- .../net/citizensnpcs/trait/Controllable.java | 9 +- .../main/java/net/citizensnpcs/util/Util.java | 2 +- main/src/main/resources/plugin.yml | 3 +- pom.xml | 3 +- v1_10_R1/pom.xml | 2 +- v1_11_R1/pom.xml | 2 +- v1_12_R1/pom.xml | 2 +- .../nms/v1_12_R1/util/NMSImpl.java | 2 - v1_13_R1/pom.xml | 77 + .../nms/v1_13_R1/entity/BatController.java | 176 ++ .../nms/v1_13_R1/entity/BlazeController.java | 167 ++ .../v1_13_R1/entity/CaveSpiderController.java | 213 +++ .../v1_13_R1/entity/ChickenController.java | 221 +++ .../nms/v1_13_R1/entity/CodController.java | 200 ++ .../nms/v1_13_R1/entity/CowController.java | 214 +++ .../v1_13_R1/entity/CreeperController.java | 224 +++ .../v1_13_R1/entity/DolphinController.java | 200 ++ .../v1_13_R1/entity/DrownedController.java | 200 ++ .../entity/EnderDragonController.java | 184 ++ .../v1_13_R1/entity/EndermanController.java | 218 +++ .../v1_13_R1/entity/EndermiteController.java | 209 +++ .../nms/v1_13_R1/entity/EntityHumanNPC.java | 564 ++++++ .../nms/v1_13_R1/entity/EvokerController.java | 202 +++ .../nms/v1_13_R1/entity/GhastController.java | 173 ++ .../nms/v1_13_R1/entity/GiantController.java | 210 +++ .../v1_13_R1/entity/GuardianController.java | 213 +++ .../entity/GuardianElderController.java | 213 +++ .../nms/v1_13_R1/entity/HorseController.java | 224 +++ .../entity/HorseDonkeyController.java | 224 +++ .../v1_13_R1/entity/HorseMuleController.java | 224 +++ .../entity/HorseSkeletonController.java | 225 +++ .../entity/HorseZombieController.java | 225 +++ .../nms/v1_13_R1/entity/HumanController.java | 153 ++ .../v1_13_R1/entity/IllusionerController.java | 201 +++ .../v1_13_R1/entity/IronGolemController.java | 210 +++ .../nms/v1_13_R1/entity/LlamaController.java | 225 +++ .../v1_13_R1/entity/MagmaCubeController.java | 221 +++ .../v1_13_R1/entity/MobEntityController.java | 61 + .../entity/MushroomCowController.java | 212 +++ .../nms/v1_13_R1/entity/OcelotController.java | 220 +++ .../nms/v1_13_R1/entity/ParrotController.java | 182 ++ .../v1_13_R1/entity/PhantomController.java | 210 +++ .../nms/v1_13_R1/entity/PigController.java | 227 +++ .../v1_13_R1/entity/PigZombieController.java | 203 +++ .../v1_13_R1/entity/PolarBearController.java | 180 ++ .../v1_13_R1/entity/PufferFishController.java | 200 ++ .../nms/v1_13_R1/entity/RabbitController.java | 234 +++ .../nms/v1_13_R1/entity/SalmonController.java | 200 ++ .../nms/v1_13_R1/entity/SheepController.java | 211 +++ .../v1_13_R1/entity/ShulkerController.java | 223 +++ .../v1_13_R1/entity/SilverfishController.java | 205 +++ .../v1_13_R1/entity/SkeletonController.java | 209 +++ .../entity/SkeletonStrayController.java | 209 +++ .../entity/SkeletonWitherController.java | 209 +++ .../nms/v1_13_R1/entity/SlimeController.java | 221 +++ .../v1_13_R1/entity/SnowmanController.java | 222 +++ .../nms/v1_13_R1/entity/SpiderController.java | 209 +++ .../nms/v1_13_R1/entity/SquidController.java | 201 +++ .../entity/TropicalFishController.java | 200 ++ .../nms/v1_13_R1/entity/TurtleController.java | 200 ++ .../nms/v1_13_R1/entity/VexController.java | 169 ++ .../v1_13_R1/entity/VillagerController.java | 256 +++ .../v1_13_R1/entity/VindicatorController.java | 212 +++ .../nms/v1_13_R1/entity/WitchController.java | 208 +++ .../nms/v1_13_R1/entity/WitherController.java | 172 ++ .../nms/v1_13_R1/entity/WolfController.java | 224 +++ .../nms/v1_13_R1/entity/ZombieController.java | 200 ++ .../v1_13_R1/entity/ZombieHuskController.java | 200 ++ .../entity/ZombieVillagerController.java | 200 ++ .../nonliving/AreaEffectCloudController.java | 115 ++ .../nonliving/ArmorStandController.java | 131 ++ .../entity/nonliving/BoatController.java | 125 ++ .../nonliving/DragonFireballController.java | 128 ++ .../entity/nonliving/EggController.java | 134 ++ .../nonliving/EnderCrystalController.java | 115 ++ .../nonliving/EnderPearlController.java | 118 ++ .../nonliving/EnderSignalController.java | 115 ++ .../nonliving/EvokerFangsController.java | 131 ++ .../nonliving/ExperienceOrbController.java | 115 ++ .../nonliving/FallingBlockController.java | 172 ++ .../entity/nonliving/FireworkController.java | 115 ++ .../nonliving/FishingHookController.java | 115 ++ .../entity/nonliving/ItemController.java | 153 ++ .../entity/nonliving/ItemFrameController.java | 150 ++ .../nonliving/LargeFireballController.java | 128 ++ .../entity/nonliving/LeashController.java | 120 ++ .../entity/nonliving/LlamaSpitController.java | 136 ++ .../nonliving/MinecartChestController.java | 125 ++ .../nonliving/MinecartCommandController.java | 124 ++ .../nonliving/MinecartFurnaceController.java | 124 ++ .../nonliving/MinecartHopperController.java | 98 + .../nonliving/MinecartRideableController.java | 124 ++ .../nonliving/MinecartSpawnerController.java | 99 + .../nonliving/MinecartTNTController.java | 98 + .../entity/nonliving/PaintingController.java | 120 ++ .../nonliving/ShulkerBulletController.java | 115 ++ .../nonliving/SmallFireballController.java | 118 ++ .../entity/nonliving/SnowballController.java | 115 ++ .../nonliving/SpectralArrowController.java | 115 ++ .../entity/nonliving/TNTPrimedController.java | 115 ++ .../nonliving/ThrownExpBottleController.java | 118 ++ .../nonliving/ThrownPotionController.java | 134 ++ .../nonliving/ThrownTridentController.java | 115 ++ .../nonliving/TippedArrowController.java | 115 ++ .../nonliving/WitherSkullController.java | 115 ++ .../nms/v1_13_R1/network/EmptyChannel.java | 80 + .../nms/v1_13_R1/network/EmptyNetHandler.java | 17 + .../v1_13_R1/network/EmptyNetworkManager.java | 19 + .../nms/v1_13_R1/network/EmptySocket.java | 21 + .../nms/v1_13_R1/trait/BossBarTrait.java | 74 + .../nms/v1_13_R1/trait/Commands.java | 149 ++ .../nms/v1_13_R1/trait/LlamaTrait.java | 37 + .../nms/v1_13_R1/trait/ParrotTrait.java | 30 + .../nms/v1_13_R1/trait/ShulkerTrait.java | 51 + .../v1_13_R1/util/CitizensBlockBreaker.java | 175 ++ .../v1_13_R1/util/CustomEntityRegistry.java | 101 ++ .../util/DummyPlayerAdvancementData.java | 57 + .../util/EmptyAdvancementDataPlayer.java | 73 + .../nms/v1_13_R1/util/NMSImpl.java | 1607 +++++++++++++++++ .../v1_13_R1/util/PlayerAnimationImpl.java | 143 ++ .../v1_13_R1/util/PlayerControllerJump.java | 21 + .../v1_13_R1/util/PlayerControllerLook.java | 110 ++ .../v1_13_R1/util/PlayerControllerMove.java | 139 ++ .../nms/v1_13_R1/util/PlayerNavigation.java | 521 ++++++ .../nms/v1_13_R1/util/PlayerPathfinder.java | 152 ++ .../util/PlayerPathfinderAbstract.java | 77 + .../v1_13_R1/util/PlayerPathfinderNormal.java | 478 +++++ .../v1_13_R1/util/PlayerlistTrackerEntry.java | 107 ++ v1_8_R3/pom.xml | 2 +- .../nms/v1_8_R3/entity/EntityHumanNPC.java | 24 +- 137 files changed, 21502 insertions(+), 104 deletions(-) create mode 100644 v1_13_R1/pom.xml create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java create mode 100644 v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java diff --git a/main/pom.xml b/main/pom.xml index ac2e8358b..6cb6cb606 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,14 +6,14 @@ net.citizensnpcs citizens-parent - 2.0.22-SNAPSHOT + 2.0.23-SNAPSHOT citizens-main UTF-8 - 1.12.1-R0.1-SNAPSHOT - 2.0.22-SNAPSHOT + 1.13-pre7-R0.1-SNAPSHOT + 2.0.23-SNAPSHOT 1.5.4 1.4.12 1.2 diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java index 0821d1ba9..56e8ebacd 100644 --- a/main/src/main/java/net/citizensnpcs/EventListen.java +++ b/main/src/main/java/net/citizensnpcs/EventListen.java @@ -85,6 +85,7 @@ import net.citizensnpcs.api.npc.NPCRegistry; import net.citizensnpcs.api.trait.trait.Owner; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.editor.Editor; import net.citizensnpcs.npc.skin.SkinUpdateTracker; import net.citizensnpcs.trait.Controllable; @@ -303,7 +304,8 @@ public class EventListen implements Listener { property.keyExists("signature") ? property.getString("signature") : null)); } } - SkullMeta meta = (SkullMeta) Bukkit.getItemFactory().getItemMeta(Material.SKULL_ITEM); + Material mat = SpigotUtil.isUsing1_13API() ? Material.SKELETON_SKULL : Material.valueOf("SKULL_ITEM"); + SkullMeta meta = (SkullMeta) Bukkit.getItemFactory().getItemMeta(mat); NMS.setProfile(meta, profile); event.getItemStack().setItemMeta(meta); } diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java index 1d6a28691..c385e269f 100644 --- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java @@ -47,6 +47,7 @@ import net.citizensnpcs.api.command.CommandMessages; import net.citizensnpcs.api.command.Requirements; import net.citizensnpcs.api.command.exception.CommandException; import net.citizensnpcs.api.command.exception.NoPermissionsException; +import net.citizensnpcs.api.command.exception.RequirementMissingException; import net.citizensnpcs.api.command.exception.ServerCommandException; import net.citizensnpcs.api.event.CommandSenderCreateNPCEvent; import net.citizensnpcs.api.event.DespawnReason; @@ -1222,8 +1223,13 @@ public class NPCCommands { min = 2, max = 2, permission = "citizens.npc.profession") - @Requirements(selected = true, ownership = true, types = { EntityType.VILLAGER, EntityType.ZOMBIE_VILLAGER }) + @Requirements(selected = true, ownership = true) public void profession(CommandContext args, CommandSender sender, NPC npc) throws CommandException { + EntityType type = npc.getTrait(MobType.class).getType(); + if (type != EntityType.VILLAGER && !type.name().equals("ZOMBIE_VILLAGER")) { + throw new RequirementMissingException(Messaging.tr(CommandMessages.REQUIREMENTS_INVALID_MOB_TYPE, + type.name().toLowerCase().replace('_', ' '))); + } String profession = args.getString(1); Profession parsed = Util.matchEnum(Profession.values(), profession.toUpperCase()); if (parsed == null) { diff --git a/main/src/main/java/net/citizensnpcs/editor/EndermanEquipper.java b/main/src/main/java/net/citizensnpcs/editor/EndermanEquipper.java index 731d93f05..e9c475bac 100644 --- a/main/src/main/java/net/citizensnpcs/editor/EndermanEquipper.java +++ b/main/src/main/java/net/citizensnpcs/editor/EndermanEquipper.java @@ -1,6 +1,7 @@ package net.citizensnpcs.editor; import org.bukkit.Material; +import org.bukkit.block.data.BlockData; import org.bukkit.entity.Enderman; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -9,6 +10,7 @@ import org.bukkit.material.MaterialData; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.trait.Equipment; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.util.Messages; public class EndermanEquipper implements Equipper { @@ -20,23 +22,46 @@ public class EndermanEquipper implements Equipper { return; } - MaterialData carried = ((Enderman) npc.getEntity()).getCarriedMaterial(); - if (carried.getItemType() == Material.AIR) { - if (hand.getType() == Material.AIR) { - Messaging.sendErrorTr(equipper, Messages.EQUIPMENT_EDITOR_INVALID_BLOCK); - return; + if (SpigotUtil.isUsing1_13API()) { + BlockData carried = ((Enderman) npc.getEntity()).getCarriedBlock(); + if (carried.getMaterial() == Material.AIR) { + if (hand.getType() == Material.AIR) { + Messaging.sendErrorTr(equipper, Messages.EQUIPMENT_EDITOR_INVALID_BLOCK); + return; + } + } else { + equipper.getWorld().dropItemNaturally(npc.getEntity().getLocation(), + new ItemStack(carried.getMaterial(), 1)); + ((Enderman) npc.getEntity()).setCarriedBlock(hand.getType().createBlockData()); + // TODO: copy block data info from itemstack? } - } else { - equipper.getWorld().dropItemNaturally(npc.getEntity().getLocation(), carried.toItemStack(1)); - ((Enderman) npc.getEntity()).setCarriedMaterial(hand.getData()); - } - ItemStack set = hand.clone(); - if (set.getType() != Material.AIR) { - set.setAmount(1); - hand.setAmount(hand.getAmount() - 1); - equipper.getInventory().setItemInHand(hand); + ItemStack set = hand.clone(); + if (set.getType() != Material.AIR) { + set.setAmount(1); + hand.setAmount(hand.getAmount() - 1); + equipper.getInventory().setItemInHand(hand); + } + npc.getTrait(Equipment.class).set(0, set); + } else { + MaterialData carried = ((Enderman) npc.getEntity()).getCarriedMaterial(); + if (carried.getItemType() == Material.AIR) { + if (hand.getType() == Material.AIR) { + Messaging.sendErrorTr(equipper, Messages.EQUIPMENT_EDITOR_INVALID_BLOCK); + return; + } + } else { + equipper.getWorld().dropItemNaturally(npc.getEntity().getLocation(), carried.toItemStack(1)); + ((Enderman) npc.getEntity()).setCarriedMaterial(hand.getData()); + } + + ItemStack set = hand.clone(); + if (set.getType() != Material.AIR) { + set.setAmount(1); + hand.setAmount(hand.getAmount() - 1); + equipper.getInventory().setItemInHand(hand); + } + npc.getTrait(Equipment.class).set(0, set); } - npc.getTrait(Equipment.class).set(0, set); } } diff --git a/main/src/main/java/net/citizensnpcs/editor/GenericEquipper.java b/main/src/main/java/net/citizensnpcs/editor/GenericEquipper.java index 5f5a59ce3..1b59683ac 100644 --- a/main/src/main/java/net/citizensnpcs/editor/GenericEquipper.java +++ b/main/src/main/java/net/citizensnpcs/editor/GenericEquipper.java @@ -1,5 +1,8 @@ package net.citizensnpcs.editor; +import java.util.EnumSet; +import java.util.Set; + import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -8,6 +11,7 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.trait.Equipment; import net.citizensnpcs.api.trait.trait.Equipment.EquipmentSlot; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.util.Messages; public class GenericEquipper implements Equipper { @@ -21,63 +25,37 @@ public class GenericEquipper implements Equipper { if (type.name().equals("ELYTRA") && !equipper.isSneaking()) { slot = EquipmentSlot.CHESTPLATE; } else { - switch (type) { - case SKULL_ITEM: - case PUMPKIN: - case JACK_O_LANTERN: - case LEATHER_HELMET: - case CHAINMAIL_HELMET: - case GOLD_HELMET: - case IRON_HELMET: - case DIAMOND_HELMET: - if (!equipper.isSneaking()) { - slot = EquipmentSlot.HELMET; - } - break; - case LEATHER_CHESTPLATE: - case CHAINMAIL_CHESTPLATE: - case GOLD_CHESTPLATE: - case IRON_CHESTPLATE: - case DIAMOND_CHESTPLATE: - if (!equipper.isSneaking()) { - slot = EquipmentSlot.CHESTPLATE; - } - break; - case LEATHER_LEGGINGS: - case CHAINMAIL_LEGGINGS: - case GOLD_LEGGINGS: - case IRON_LEGGINGS: - case DIAMOND_LEGGINGS: - if (!equipper.isSneaking()) { - slot = EquipmentSlot.LEGGINGS; - } - break; - case LEATHER_BOOTS: - case CHAINMAIL_BOOTS: - case GOLD_BOOTS: - case IRON_BOOTS: - case DIAMOND_BOOTS: - if (!equipper.isSneaking()) { - slot = EquipmentSlot.BOOTS; - } - break; - case AIR: - if (equipper.isSneaking()) { - for (int i = 0; i < 6; i++) { - if (trait.get(i) != null && trait.get(i).getType() != Material.AIR) { - equipper.getWorld().dropItemNaturally(toEquip.getEntity().getLocation(), trait.get(i)); - trait.set(i, null); - } + if (HELMETS.contains(type)) { + if (!equipper.isSneaking()) { + slot = EquipmentSlot.HELMET; + } + } else if (CHESTPLATES.contains(type)) { + if (!equipper.isSneaking()) { + slot = EquipmentSlot.CHESTPLATE; + } + } else if (LEGGINGS.contains(type)) { + if (!equipper.isSneaking()) { + slot = EquipmentSlot.LEGGINGS; + } + } else if (BOOTS.contains(type)) { + if (!equipper.isSneaking()) { + slot = EquipmentSlot.BOOTS; + } + } else if (type == Material.AIR) { + if (equipper.isSneaking()) { + for (int i = 0; i < 6; i++) { + if (trait.get(i) != null && trait.get(i).getType() != Material.AIR) { + equipper.getWorld().dropItemNaturally(toEquip.getEntity().getLocation(), trait.get(i)); + trait.set(i, null); } - Messaging.sendTr(equipper, Messages.EQUIPMENT_EDITOR_ALL_ITEMS_REMOVED, toEquip.getName()); - } else { - return; } - break; - default: - break; + Messaging.sendTr(equipper, Messages.EQUIPMENT_EDITOR_ALL_ITEMS_REMOVED, toEquip.getName()); + } else { + return; + } } } + // Drop any previous equipment on the ground ItemStack equippedItem = trait.get(slot); if (equippedItem != null && equippedItem.getType() != Material.AIR) { @@ -94,4 +72,17 @@ public class GenericEquipper implements Equipper { equipper.getInventory().setItemInHand(hand); } } + + private static Set BOOTS = EnumSet.of(Material.CHAINMAIL_BOOTS, Material.DIAMOND_BOOTS, + Material.IRON_BOOTS, Material.LEATHER_BOOTS, + SpigotUtil.isUsing1_13API() ? Material.GOLDEN_BOOTS : Material.valueOf("GOLD_BOOTS")); + private static Set CHESTPLATES = EnumSet.of(Material.CHAINMAIL_CHESTPLATE, Material.DIAMOND_CHESTPLATE, + Material.IRON_CHESTPLATE, Material.LEATHER_CHESTPLATE, + SpigotUtil.isUsing1_13API() ? Material.GOLDEN_CHESTPLATE : Material.valueOf("GOLD_CHESTPLATE")); + private static Set HELMETS = EnumSet.of(Material.PUMPKIN, Material.JACK_O_LANTERN, + Material.LEATHER_HELMET, Material.CHAINMAIL_HELMET, Material.IRON_HELMET, Material.DIAMOND_HELMET, + SpigotUtil.isUsing1_13API() ? Material.GOLDEN_HELMET : Material.valueOf("GOLD_HELMET")); + private static Set LEGGINGS = EnumSet.of(Material.CHAINMAIL_LEGGINGS, Material.DIAMOND_LEGGINGS, + Material.IRON_LEGGINGS, Material.LEATHER_LEGGINGS, + SpigotUtil.isUsing1_13API() ? Material.GOLDEN_LEGGINGS : Material.valueOf("GOLD_LEGGINGS")); } diff --git a/main/src/main/java/net/citizensnpcs/editor/SheepEquipper.java b/main/src/main/java/net/citizensnpcs/editor/SheepEquipper.java index 26919bf76..5f7c614da 100644 --- a/main/src/main/java/net/citizensnpcs/editor/SheepEquipper.java +++ b/main/src/main/java/net/citizensnpcs/editor/SheepEquipper.java @@ -9,6 +9,7 @@ import org.bukkit.material.Dye; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.api.util.SpigotUtil; import net.citizensnpcs.trait.SheepTrait; import net.citizensnpcs.trait.WoolColor; import net.citizensnpcs.util.Messages; @@ -21,7 +22,7 @@ public class SheepEquipper implements Equipper { if (hand.getType() == Material.SHEARS) { Messaging.sendTr(equipper, toEquip.getTrait(SheepTrait.class).toggleSheared() ? Messages.SHEARED_SET : Messages.SHEARED_STOPPED, toEquip.getName()); - } else if (hand.getType() == Material.INK_SACK) { + } else if (hand.getType() == (SpigotUtil.isUsing1_13API() ? Material.INK_SAC : Material.valueOf("INK_SACK"))) { Dye dye = (Dye) hand.getData(); if (sheep.getColor() == dye.getColor()) return; diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java b/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java index c332c272a..6bf5066bb 100644 --- a/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java +++ b/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java @@ -1,23 +1,48 @@ package net.citizensnpcs.npc; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import net.citizensnpcs.api.CitizensAPI; + import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.TraitFactory; import net.citizensnpcs.api.trait.TraitInfo; -import net.citizensnpcs.api.trait.trait.*; -import net.citizensnpcs.trait.*; +import net.citizensnpcs.api.trait.trait.Equipment; +import net.citizensnpcs.api.trait.trait.Inventory; +import net.citizensnpcs.api.trait.trait.MobType; +import net.citizensnpcs.api.trait.trait.Owner; +import net.citizensnpcs.api.trait.trait.Spawned; +import net.citizensnpcs.api.trait.trait.Speech; +import net.citizensnpcs.trait.Age; +import net.citizensnpcs.trait.Anchors; +import net.citizensnpcs.trait.ArmorStandTrait; +import net.citizensnpcs.trait.Controllable; +import net.citizensnpcs.trait.CurrentLocation; +import net.citizensnpcs.trait.Gravity; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.trait.LookClose; +import net.citizensnpcs.trait.MountTrait; +import net.citizensnpcs.trait.OcelotModifiers; +import net.citizensnpcs.trait.Poses; +import net.citizensnpcs.trait.Powered; +import net.citizensnpcs.trait.RabbitType; +import net.citizensnpcs.trait.Saddle; +import net.citizensnpcs.trait.ScriptTrait; +import net.citizensnpcs.trait.SheepTrait; +import net.citizensnpcs.trait.SkinLayers; +import net.citizensnpcs.trait.SlimeSize; +import net.citizensnpcs.trait.VillagerProfession; +import net.citizensnpcs.trait.WitherTrait; +import net.citizensnpcs.trait.WolfModifiers; +import net.citizensnpcs.trait.WoolColor; import net.citizensnpcs.trait.text.Text; import net.citizensnpcs.trait.waypoint.Waypoints; -import org.bstats.bukkit.Metrics; - -import java.util.List; -import java.util.Map; -import java.util.Set; public class CitizensTraitFactory implements TraitFactory { private final List defaultTraits = Lists.newArrayList(); diff --git a/main/src/main/java/net/citizensnpcs/trait/Controllable.java b/main/src/main/java/net/citizensnpcs/trait/Controllable.java index ea051edb7..3e675a953 100644 --- a/main/src/main/java/net/citizensnpcs/trait/Controllable.java +++ b/main/src/main/java/net/citizensnpcs/trait/Controllable.java @@ -129,8 +129,13 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab } public boolean mount(Player toMount) { - Entity passenger = npc.getEntity().getPassenger(); - if (passenger != null && passenger != toMount) { + boolean found = NMS.getPassengers(npc.getEntity()).size() == 0; + for (Entity passenger : NMS.getPassengers(npc.getEntity())) { + if (passenger != null && passenger == toMount) { + found = true; + } + } + if (!found) { return false; } enterOrLeaveVehicle(toMount); diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java index 01ba657e4..979cbbd0c 100644 --- a/main/src/main/java/net/citizensnpcs/util/Util.java +++ b/main/src/main/java/net/citizensnpcs/util/Util.java @@ -178,7 +178,7 @@ public class Util { if (parts.contains("*")) return true; for (String part : Splitter.on(',').split(parts)) { - if (Material.matchMaterial(part) == player.getInventory().getItemInHand().getType()) { + if (Material.matchMaterial(part, true) == player.getInventory().getItemInMainHand().getType()) { return true; } } diff --git a/main/src/main/resources/plugin.yml b/main/src/main/resources/plugin.yml index 04f63b180..7110cb85e 100644 --- a/main/src/main/resources/plugin.yml +++ b/main/src/main/resources/plugin.yml @@ -4,6 +4,7 @@ softdepend: [Vault] version: ${project.version} (build ${BUILD_NUMBER}) main: net.citizensnpcs.Citizens website: http://www.citizensnpcs.co +api-version: "1.13" commands: traitc: aliases: [trc] @@ -1637,4 +1638,4 @@ permissions: citizens.kit.op: default: op children: - citizens.*: true + citizens.*: true \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5dc633e10..0bb54947b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,14 @@ pom net.citizensnpcs citizens-parent - 2.0.22-SNAPSHOT + 2.0.23-SNAPSHOT main v1_8_R3 v1_10_R1 v1_11_R1 v1_12_R1 + v1_13_R1 dist \ No newline at end of file diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml index 5d154b5af..d10afc413 100644 --- a/v1_10_R1/pom.xml +++ b/v1_10_R1/pom.xml @@ -5,7 +5,7 @@ net.citizensnpcs citizens-parent - 2.0.22-SNAPSHOT + 2.0.23-SNAPSHOT citizens-v1_10_R1 diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml index e9da15c9e..c53fa5240 100644 --- a/v1_11_R1/pom.xml +++ b/v1_11_R1/pom.xml @@ -5,7 +5,7 @@ net.citizensnpcs citizens-parent - 2.0.22-SNAPSHOT + 2.0.23-SNAPSHOT citizens-v1_11_R1 diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml index 2804553c2..a6314c2d1 100644 --- a/v1_12_R1/pom.xml +++ b/v1_12_R1/pom.xml @@ -5,7 +5,7 @@ net.citizensnpcs citizens-parent - 2.0.22-SNAPSHOT + 2.0.23-SNAPSHOT citizens-v1_12_R1 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 945430669..c9d87e747 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 @@ -1527,9 +1527,7 @@ public class NMSImpl implements NMSBridge { private static final Field RABBIT_FIELD = NMS.getField(EntityRabbit.class, "bx"); private static final Random RANDOM = Util.getFastRandom(); private static Field SKULL_PROFILE_FIELD; - private static Field TRACKED_ENTITY_SET = NMS.getField(EntityTracker.class, "c"); - private static final Field WITHER_BOSS_BAR_FIELD = NMS.getField(EntityWither.class, "bG"); static { diff --git a/v1_13_R1/pom.xml b/v1_13_R1/pom.xml new file mode 100644 index 000000000..a6a557ed1 --- /dev/null +++ b/v1_13_R1/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + net.citizensnpcs + citizens-parent + 2.0.23-SNAPSHOT + + citizens-v1_13_R1 + + + UTF-8 + 1.13-pre7-R0.1-SNAPSHOT + + + + + everything + http://repo.citizensnpcs.co + + + + + + ${project.groupId} + citizens-main + ${project.version} + jar + provided + + + org.bukkit + craftbukkit + ${craftbukkit.version} + jar + provided + + + + + clean package install + ${basedir}/src/main/java + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + org.apache.maven.plugins + maven-shade-plugin + 2.1 + + + package + + shade + + + + + + + diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java new file mode 100644 index 000000000..7c89bb8c1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java @@ -0,0 +1,176 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftBat; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Bat; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityBat; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class BatController extends MobEntityController { + public BatController() { + super(EntityBatNPC.class); + } + + @Override + public Bat getBukkitEntity() { + return (Bat) super.getBukkitEntity(); + } + + public static class BatNPC extends CraftBat implements NPCHolder { + private final CitizensNPC npc; + + public BatNPC(EntityBatNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityBatNPC extends EntityBat implements NPCHolder { + private final CitizensNPC npc; + + public EntityBatNPC(World world) { + this(world, null); + } + + public EntityBatNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + setFlying(false); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new BatNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) { + return super.isLeashed(); + } + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + if (npc == null) { + super.mobTick(); + } else { + NMSImpl.updateAI(this); + npc.update(); + } + } + + public void setFlying(boolean flying) { + setAsleep(flying); + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java new file mode 100644 index 000000000..c8dfa5451 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java @@ -0,0 +1,167 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Blaze; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityBlaze; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class BlazeController extends MobEntityController { + public BlazeController() { + super(EntityBlazeNPC.class); + } + + @Override + public Blaze getBukkitEntity() { + return (Blaze) super.getBukkitEntity(); + } + + public static class BlazeNPC extends CraftBlaze implements NPCHolder { + private final CitizensNPC npc; + + public BlazeNPC(EntityBlazeNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder { + private final CitizensNPC npc; + + public EntityBlazeNPC(World world) { + this(world, null); + } + + public EntityBlazeNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new BlazeNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + if (npc != null) { + npc.update(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java new file mode 100644 index 000000000..b2ba133e1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java @@ -0,0 +1,213 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.CaveSpider; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityCaveSpider; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class CaveSpiderController extends MobEntityController { + public CaveSpiderController() { + super(EntityCaveSpiderNPC.class); + } + + @Override + public CaveSpider getBukkitEntity() { + return (CaveSpider) super.getBukkitEntity(); + } + + public static class CaveSpiderNPC extends CraftCaveSpider implements NPCHolder { + private final CitizensNPC npc; + + public CaveSpiderNPC(EntityCaveSpiderNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder { + private final CitizensNPC npc; + + public EntityCaveSpiderNPC(World world) { + this(world, null); + } + + public EntityCaveSpiderNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new CaveSpiderNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) { + return super.isLeashed(); + } + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) { + return super.isLeashed(); + } + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java new file mode 100644 index 000000000..84554d480 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java @@ -0,0 +1,221 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Chicken; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityChicken; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class ChickenController extends MobEntityController { + public ChickenController() { + super(EntityChickenNPC.class); + } + + @Override + public Chicken getBukkitEntity() { + return (Chicken) super.getBukkitEntity(); + } + + public static class ChickenNPC extends CraftChicken implements NPCHolder { + private final CitizensNPC npc; + + public ChickenNPC(EntityChickenNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityChickenNPC extends EntityChicken implements NPCHolder { + private final CitizensNPC npc; + + public EntityChickenNPC(World world) { + this(world, null); + } + + public EntityChickenNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ChickenNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void k() { + if (npc != null) { + this.bI = 100; // egg timer + } + super.k(); + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java new file mode 100644 index 000000000..e8cefbbce --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCod; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Cod; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityCod; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class CodController extends MobEntityController { + public CodController() { + super(EntityCodNPC.class); + } + + @Override + public Cod getBukkitEntity() { + return (Cod) super.getBukkitEntity(); + } + + public static class CodNPC extends CraftCod implements NPCHolder { + private final CitizensNPC npc; + + public CodNPC(EntityCodNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityCodNPC extends EntityCod implements NPCHolder { + private final CitizensNPC npc; + + public EntityCodNPC(World world) { + this(world, null); + } + + public EntityCodNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new CodNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java new file mode 100644 index 000000000..ebeeb298e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java @@ -0,0 +1,214 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCow; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Cow; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityCow; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class CowController extends MobEntityController { + public CowController() { + super(EntityCowNPC.class); + } + + @Override + public Cow getBukkitEntity() { + return (Cow) super.getBukkitEntity(); + } + + public static class CowNPC extends CraftCow implements NPCHolder { + private final CitizensNPC npc; + + public CowNPC(EntityCowNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityCowNPC extends EntityCow implements NPCHolder { + private final CitizensNPC npc; + + public EntityCowNPC(World world) { + this(world, null); + } + + public EntityCowNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new CowNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java new file mode 100644 index 000000000..6c605a8c6 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java @@ -0,0 +1,224 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Creeper; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityCreeper; +import net.minecraft.server.v1_13_R1.EntityLightning; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class CreeperController extends MobEntityController { + public CreeperController() { + super(EntityCreeperNPC.class); + } + + @Override + public Creeper getBukkitEntity() { + return (Creeper) super.getBukkitEntity(); + } + + public static class CreeperNPC extends CraftCreeper implements NPCHolder { + private final CitizensNPC npc; + + public CreeperNPC(EntityCreeperNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder { + private boolean allowPowered; + private final CitizensNPC npc; + + public EntityCreeperNPC(World world) { + this(world, null); + } + + public EntityCreeperNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.f(x, y, z); + } + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new CreeperNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void onLightningStrike(EntityLightning entitylightning) { + if (npc == null || allowPowered) { + super.onLightningStrike(entitylightning); + } + } + + public void setAllowPowered(boolean allowPowered) { + this.allowPowered = allowPowered; + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java new file mode 100644 index 000000000..ab653c63c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDolphin; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Dolphin; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityDolphin; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class DolphinController extends MobEntityController { + public DolphinController() { + super(EntityDolphinNPC.class); + } + + @Override + public Dolphin getBukkitEntity() { + return (Dolphin) super.getBukkitEntity(); + } + + public static class DolphinNPC extends CraftDolphin implements NPCHolder { + private final CitizensNPC npc; + + public DolphinNPC(EntityDolphinNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityDolphinNPC extends EntityDolphin implements NPCHolder { + private final CitizensNPC npc; + + public EntityDolphinNPC(World world) { + this(world, null); + } + + public EntityDolphinNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new DolphinNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java new file mode 100644 index 000000000..3e89360ed --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDrowned; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Drowned; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityDrowned; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class DrownedController extends MobEntityController { + public DrownedController() { + super(EntityDrownedNPC.class); + } + + @Override + public Drowned getBukkitEntity() { + return (Drowned) super.getBukkitEntity(); + } + + public static class DrownedNPC extends CraftDrowned implements NPCHolder { + private final CitizensNPC npc; + + public DrownedNPC(EntityDrownedNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityDrownedNPC extends EntityDrowned implements NPCHolder { + private final CitizensNPC npc; + + public EntityDrownedNPC(World world) { + this(world, null); + } + + public EntityDrownedNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new DrownedNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java new file mode 100644 index 000000000..76c2094dd --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java @@ -0,0 +1,184 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.EnderDragon; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityEnderDragon; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class EnderDragonController extends MobEntityController { + public EnderDragonController() { + super(EntityEnderDragonNPC.class); + } + + @Override + public EnderDragon getBukkitEntity() { + return (EnderDragon) super.getBukkitEntity(); + } + + public static class EnderDragonNPC extends CraftEnderDragon implements NPCHolder { + private final CitizensNPC npc; + + public EnderDragonNPC(EntityEnderDragonNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder { + private final CitizensNPC npc; + + public EntityEnderDragonNPC(World world) { + this(world, null); + } + + public EntityEnderDragonNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EnderDragonNPC(this); + } + return super.getBukkitEntity(); + } + + private float getCorrectYaw(double tX, double tZ) { + if (locZ > tZ) + return (float) (-Math.toDegrees(Math.atan((locX - tX) / (locZ - tZ)))); + if (locZ < tZ) { + return (float) (-Math.toDegrees(Math.atan((locX - tX) / (locZ - tZ)))) + 180.0F; + } + return yaw; + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void k() { + if (npc != null) { + npc.update(); + if (motX != 0 || motY != 0 || motZ != 0) { + motX *= 0.98; + motY *= 0.98; + motZ *= 0.98; + yaw = getCorrectYaw(locX + motX, locZ + motZ); + setPosition(locX + motX, locY + motY, locZ + motZ); + } + } else { + super.k(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java new file mode 100644 index 000000000..2d16f950f --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java @@ -0,0 +1,218 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Enderman; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityEnderman; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class EndermanController extends MobEntityController { + public EndermanController() { + super(EntityEndermanNPC.class); + } + + @Override + public Enderman getBukkitEntity() { + return (Enderman) super.getBukkitEntity(); + } + + public static class EndermanNPC extends CraftEnderman implements NPCHolder { + private final CitizensNPC npc; + + public EndermanNPC(EntityEndermanNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder { + private final CitizensNPC npc; + + public EntityEndermanNPC(World world) { + this(world, null); + } + + public EntityEndermanNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EndermanNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public boolean j(double d1, double d2, double d3) { + if (npc == null) { + return super.j(d1, d2, d3); + } + return false; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java new file mode 100644 index 000000000..e660873eb --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java @@ -0,0 +1,209 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEndermite; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Endermite; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityEndermite; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class EndermiteController extends MobEntityController { + public EndermiteController() { + super(EntityEndermiteNPC.class); + } + + @Override + public Endermite getBukkitEntity() { + return (Endermite) super.getBukkitEntity(); + } + + public static class EndermiteNPC extends CraftEndermite implements NPCHolder { + private final CitizensNPC npc; + + public EndermiteNPC(EntityEndermiteNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder { + private final CitizensNPC npc; + + public EntityEndermiteNPC(World world) { + this(world, null); + } + + public EntityEndermiteNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EndermiteNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) + npc.update(); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java new file mode 100644 index 000000000..d24844e89 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java @@ -0,0 +1,564 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.net.Socket; +import java.util.List; +import java.util.Map; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; +import org.bukkit.metadata.MetadataValue; +import org.bukkit.plugin.Plugin; +import org.bukkit.util.Vector; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +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.event.NPCPushEvent; +import net.citizensnpcs.api.npc.MetadataStore; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.trait.trait.Inventory; +import net.citizensnpcs.nms.v1_13_R1.network.EmptyNetHandler; +import net.citizensnpcs.nms.v1_13_R1.network.EmptyNetworkManager; +import net.citizensnpcs.nms.v1_13_R1.network.EmptySocket; +import net.citizensnpcs.nms.v1_13_R1.util.EmptyAdvancementDataPlayer; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerJump; +import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerLook; +import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_13_R1.util.PlayerNavigation; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.npc.skin.SkinPacketTracker; +import net.citizensnpcs.npc.skin.SkinnableEntity; +import net.citizensnpcs.trait.Gravity; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.AttributeInstance; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.ChatComponentText; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.EnumGamemode; +import net.minecraft.server.v1_13_R1.EnumItemSlot; +import net.minecraft.server.v1_13_R1.EnumProtocolDirection; +import net.minecraft.server.v1_13_R1.GenericAttributes; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.IChatBaseComponent; +import net.minecraft.server.v1_13_R1.MathHelper; +import net.minecraft.server.v1_13_R1.MinecraftServer; +import net.minecraft.server.v1_13_R1.NavigationAbstract; +import net.minecraft.server.v1_13_R1.NetworkManager; +import net.minecraft.server.v1_13_R1.Packet; +import net.minecraft.server.v1_13_R1.PacketPlayOutEntityEquipment; +import net.minecraft.server.v1_13_R1.PacketPlayOutEntityHeadRotation; +import net.minecraft.server.v1_13_R1.PathType; +import net.minecraft.server.v1_13_R1.PlayerInteractManager; +import net.minecraft.server.v1_13_R1.WorldServer; + +public class EntityHumanNPC extends EntityPlayer implements NPCHolder, SkinnableEntity { + private final Map bz = Maps.newEnumMap(PathType.class); + private PlayerControllerJump controllerJump; + private PlayerControllerLook controllerLook; + private PlayerControllerMove controllerMove; + private boolean isTracked = false; + private int jumpTicks = 0; + private PlayerNavigation navigation; + private final CitizensNPC npc; + private final Location packetLocationCache = new Location(null, 0, 0, 0); + private final SkinPacketTracker skinTracker; + private int updateCounter = 0; + + public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, + PlayerInteractManager playerInteractManager, NPC npc) { + super(minecraftServer, world, gameProfile, playerInteractManager); + + this.npc = (CitizensNPC) npc; + if (npc != null) { + skinTracker = new SkinPacketTracker(this); + playerInteractManager.setGameMode(EnumGamemode.SURVIVAL); + initialise(minecraftServer); + } else { + skinTracker = null; + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public boolean a(EntityPlayer entityplayer) { + if (npc != null && !isTracked) { + return false; + } + return super.a(entityplayer); + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + public float a(PathType pathtype) { + return this.bz.containsKey(pathtype) ? this.bz.get(pathtype).floatValue() : pathtype.a(); + } + + public void a(PathType pathtype, float f) { + this.bz.put(pathtype, Float.valueOf(f)); + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 damageEntity(DamageSource damagesource, float f) { + // knock back velocity is cancelled and sent to client for handling when + // the entity is a player. there is no client so make this happen + // manually. + boolean damaged = super.damageEntity(damagesource, f); + if (damaged && velocityChanged) { + velocityChanged = false; + Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() { + @Override + public void run() { + EntityHumanNPC.this.velocityChanged = true; + } + }); + } + return damaged; + } + + @Override + public void die() { + super.die(); + getAdvancementData().a(); + } + + @Override + public void die(DamageSource damagesource) { + // players that die are not normally removed from the world. when the + // NPC dies, we are done with the instance and it should be removed. + if (dead) { + return; + } + super.die(damagesource); + Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() { + @Override + public void run() { + world.removeEntity(EntityHumanNPC.this); + } + }, 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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.f(x, y, z); + } + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftPlayer getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new PlayerNPC(this); + } + return super.getBukkitEntity(); + } + + public PlayerControllerJump getControllerJump() { + return controllerJump; + } + + public PlayerControllerMove getControllerMove() { + return controllerMove; + } + + public NavigationAbstract getNavigation() { + return navigation; + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public IChatBaseComponent getPlayerListName() { + if (Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()) { + return new ChatComponentText(""); + } + return super.getPlayerListName(); + } + + @Override + public String getSkinName() { + MetadataStore meta = npc.data(); + + String skinName = meta.get(NPC.PLAYER_SKIN_UUID_METADATA); + if (skinName == null) { + skinName = ChatColor.stripColor(getName()); + } + return skinName.toLowerCase(); + } + + @Override + public SkinPacketTracker getSkinTracker() { + return skinTracker; + } + + private void initialise(MinecraftServer minecraftServer) { + Socket socket = new EmptySocket(); + NetworkManager conn = null; + try { + conn = new EmptyNetworkManager(EnumProtocolDirection.CLIENTBOUND); + playerConnection = new EmptyNetHandler(minecraftServer, conn, this); + conn.setPacketListener(playerConnection); + socket.close(); + } catch (IOException e) { + // swallow + } + + AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE); + if (range == null) { + range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE); + } + range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble()); + + controllerJump = new PlayerControllerJump(this); + controllerLook = new PlayerControllerLook(this); + controllerMove = new PlayerControllerMove(this); + navigation = new PlayerNavigation(this, world); + NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing + setSkinFlags((byte) 0xFF); + + EmptyAdvancementDataPlayer.clear(this.getAdvancementData()); + try { + ADVANCEMENT_DATA_PLAYER.set(this, + new EmptyAdvancementDataPlayer(minecraftServer, CitizensAPI.getDataFolder().getParentFile(), this)); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + + @Override + public boolean isCollidable() { + return npc == null ? super.isCollidable() : npc.data().get(NPC.COLLIDABLE_METADATA, true); + } + + public boolean isNavigating() { + return npc.getNavigator().isNavigating(); + } + + public void livingEntityBaseTick() { + W(); + this.aF = this.aG; + this.aM = this.aN; + if (this.hurtTicks > 0) { + this.hurtTicks -= 1; + } + tickPotionEffects(); + this.bc = this.bb; + this.aR = this.aQ; + this.aT = this.aS; + this.lastYaw = this.yaw; + this.lastPitch = this.pitch; + } + + private void moveOnCurrentHeading() { + if (bg) { + if (onGround && jumpTicks == 0) { + cG(); + jumpTicks = 10; + } + } else { + jumpTicks = 0; + } + bh *= 0.98F; + bj *= 0.98F; + bk *= 0.9F; + a(bh, bi, bj); // movement method + NMS.setHeadYaw(getBukkitEntity(), yaw); + if (jumpTicks > 0) { + jumpTicks--; + } + } + + public void setMoveDestination(double x, double y, double z, double speed) { + controllerMove.a(x, y, z, speed); + } + + public void setShouldJump() { + controllerJump.a(); + } + + @Override + public void setSkinFlags(byte flags) { + // set skin flag byte + getDataWatcher().set(EntityHuman.bx, flags); + } + + @Override + public void setSkinName(String name) { + setSkinName(name, false); + } + + @Override + public void setSkinName(String name, boolean forceUpdate) { + Preconditions.checkNotNull(name); + + npc.data().setPersistent(NPC.PLAYER_SKIN_UUID_METADATA, name.toLowerCase()); + skinTracker.notifySkinChange(forceUpdate); + } + + @Override + public void setSkinPersistent(String skinName, String signature, String data) { + Preconditions.checkNotNull(skinName); + Preconditions.checkNotNull(signature); + Preconditions.checkNotNull(data); + + npc.data().setPersistent(NPC.PLAYER_SKIN_UUID_METADATA, skinName.toLowerCase()); + npc.data().setPersistent(NPC.PLAYER_SKIN_TEXTURE_PROPERTIES_SIGN_METADATA, signature); + npc.data().setPersistent(NPC.PLAYER_SKIN_TEXTURE_PROPERTIES_METADATA, data); + npc.data().setPersistent(NPC.PLAYER_SKIN_USE_LATEST, false); + npc.data().setPersistent("cached-skin-uuid-name", skinName.toLowerCase()); + skinTracker.notifySkinChange(false); + } + + public void setTargetLook(Entity target, float yawOffset, float renderOffset) { + controllerLook.a(target, yawOffset, renderOffset); + } + + public void setTargetLook(Location target) { + controllerLook.a(target.getX(), target.getY(), target.getZ(), 10, 40); + } + + public void setTracked() { + isTracked = true; + } + + @Override + public void tick() { + super.tick(); + if (npc == null) + return; + this.noclip = isSpectator(); + if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) { + updateEffects = true; + } + Bukkit.getServer().getPluginManager().unsubscribeFromPermission("bukkit.broadcast.user", bukkitEntity); + livingEntityBaseTick(); + + boolean navigating = npc.getNavigator().isNavigating(); + updatePackets(navigating); + if (!navigating && getBukkitEntity() != null && npc.getTrait(Gravity.class).hasGravity() + && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION))) { + a(0, 0, 0); + } + if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) { + motX = motY = motZ = 0; + } + if (navigating) { + if (!NMSImpl.isNavigationFinished(navigation)) { + NMSImpl.updateNavigation(navigation); + } + moveOnCurrentHeading(); + } + NMSImpl.updateAI(this); + + if (noDamageTicks > 0) { + --noDamageTicks; + } + + npc.update(); + } + + public void updateAI() { + controllerMove.a(); + controllerLook.a(); + controllerJump.b(); + } + + private void updatePackets(boolean navigating) { + if (updateCounter++ <= Setting.PACKET_UPDATE_DELAY.asInt()) + return; + + updateCounter = 0; + Location current = getBukkitEntity().getLocation(packetLocationCache); + Packet[] packets = new Packet[navigating ? EnumItemSlot.values().length : EnumItemSlot.values().length + 1]; + if (!navigating) { + packets[5] = new PacketPlayOutEntityHeadRotation(this, + (byte) MathHelper.d(NMSImpl.getHeadYaw(this) * 256.0F / 360.0F)); + } + int i = 0; + for (EnumItemSlot slot : EnumItemSlot.values()) { + packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot)); + } + NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets); + } + + public void updatePathfindingRange(float pathfindingRange) { + this.navigation.setRange(pathfindingRange); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + public static class PlayerNPC extends CraftPlayer implements NPCHolder, SkinnableEntity { + private final CraftServer cserver; + private final CitizensNPC npc; + + private PlayerNPC(EntityHumanNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + this.cserver = (CraftServer) Bukkit.getServer(); + npc.getTrait(Inventory.class); + } + + @Override + public Player getBukkitEntity() { + return this; + } + + @Override + public EntityHumanNPC getHandle() { + return (EntityHumanNPC) this.entity; + } + + @Override + public List getMetadata(String metadataKey) { + return cserver.getEntityMetadata().getMetadata(this, metadataKey); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public String getSkinName() { + return ((SkinnableEntity) this.entity).getSkinName(); + } + + @Override + public SkinPacketTracker getSkinTracker() { + return ((SkinnableEntity) this.entity).getSkinTracker(); + } + + @Override + public boolean hasMetadata(String metadataKey) { + return cserver.getEntityMetadata().hasMetadata(this, metadataKey); + } + + @Override + public void removeMetadata(String metadataKey, Plugin owningPlugin) { + cserver.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); + } + + @Override + public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { + cserver.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); + } + + @Override + public void setSkinFlags(byte flags) { + ((SkinnableEntity) this.entity).setSkinFlags(flags); + } + + @Override + public void setSkinName(String name) { + ((SkinnableEntity) this.entity).setSkinName(name); + } + + @Override + public void setSkinName(String skinName, boolean forceUpdate) { + ((SkinnableEntity) this.entity).setSkinName(skinName, forceUpdate); + } + + @Override + public void setSkinPersistent(String skinName, String signature, String data) { + ((SkinnableEntity) this.entity).setSkinPersistent(skinName, signature, data); + } + } + + private static Field ADVANCEMENT_DATA_PLAYER = NMS.getField(EntityPlayer.class, "cg"); + private static final float EPSILON = 0.005F; + private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0); + static { + Field modifiersField = NMS.getField(Field.class, "modifiers"); + try { + modifiersField.setInt(ADVANCEMENT_DATA_PLAYER, ADVANCEMENT_DATA_PLAYER.getModifiers() & ~Modifier.FINAL); + } catch (Exception e) { + } + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java new file mode 100644 index 000000000..15e28169f --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java @@ -0,0 +1,202 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEvoker; +import org.bukkit.entity.Evoker; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityEvoker; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class EvokerController extends MobEntityController { + public EvokerController() { + super(EntityEvokerNPC.class); + } + + @Override + public Evoker getBukkitEntity() { + return (Evoker) super.getBukkitEntity(); + } + + public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder { + private final CitizensNPC npc; + + public EntityEvokerNPC(World world) { + this(world, null); + } + + public EntityEvokerNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EvokerNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class EvokerNPC extends CraftEvoker implements NPCHolder { + private final CitizensNPC npc; + + public EvokerNPC(EntityEvokerNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java new file mode 100644 index 000000000..aa2a20e09 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java @@ -0,0 +1,173 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftGhast; +import org.bukkit.entity.Ghast; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityGhast; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class GhastController extends MobEntityController { + public GhastController() { + super(EntityGhastNPC.class); + } + + @Override + public Ghast getBukkitEntity() { + return (Ghast) super.getBukkitEntity(); + } + + public static class EntityGhastNPC extends EntityGhast implements NPCHolder { + private final CitizensNPC npc; + + public EntityGhastNPC(World world) { + this(world, null); + } + + public EntityGhastNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public boolean cO() { + return npc != null; + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new GhastNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + if (npc != null) { + npc.update(); + } + super.mobTick(); + } + } + + public static class GhastNPC extends CraftGhast implements NPCHolder { + private final CitizensNPC npc; + + public GhastNPC(EntityGhastNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java new file mode 100644 index 000000000..833ef4b4b --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java @@ -0,0 +1,210 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftGiant; +import org.bukkit.entity.Giant; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityGiantZombie; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class GiantController extends MobEntityController { + public GiantController() { + super(EntityGiantNPC.class); + } + + @Override + public Giant getBukkitEntity() { + return (Giant) super.getBukkitEntity(); + } + + public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder { + private final CitizensNPC npc; + + public EntityGiantNPC(World world) { + this(world, null); + } + + public EntityGiantNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new GiantNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class GiantNPC extends CraftGiant implements NPCHolder { + private final CitizensNPC npc; + + public GiantNPC(EntityGiantNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java new file mode 100644 index 000000000..1d8baa669 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java @@ -0,0 +1,213 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftGuardian; +import org.bukkit.entity.Guardian; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityGuardian; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class GuardianController extends MobEntityController { + public GuardianController() { + super(EntityGuardianNPC.class); + } + + @Override + public Guardian getBukkitEntity() { + return (Guardian) super.getBukkitEntity(); + } + + public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder { + private final CitizensNPC npc; + + public EntityGuardianNPC(World world) { + this(world, null); + } + + public EntityGuardianNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new GuardianNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void k() { + if (npc == null) { + super.k(); + } else { + NMSImpl.updateAI(this); + npc.update(); + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class GuardianNPC extends CraftGuardian implements NPCHolder { + private final CitizensNPC npc; + + public GuardianNPC(EntityGuardianNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java new file mode 100644 index 000000000..b94ab3e7c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java @@ -0,0 +1,213 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftElderGuardian; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.ElderGuardian; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityGuardianElder; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class GuardianElderController extends MobEntityController { + public GuardianElderController() { + super(EntityGuardianElderNPC.class); + } + + @Override + public ElderGuardian getBukkitEntity() { + return (ElderGuardian) super.getBukkitEntity(); + } + + public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder { + private final CitizensNPC npc; + + public EntityGuardianElderNPC(World world) { + this(world, null); + } + + public EntityGuardianElderNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new GuardianElderNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void k() { + if (npc == null) { + super.k(); + } else { + NMSImpl.updateAI(this); + npc.update(); + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class GuardianElderNPC extends CraftElderGuardian implements NPCHolder { + private final CitizensNPC npc; + + public GuardianElderNPC(EntityGuardianElderNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java new file mode 100644 index 000000000..1a58ecff7 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java @@ -0,0 +1,224 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftHorse; +import org.bukkit.entity.Horse; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHorse; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class HorseController extends MobEntityController { + public HorseController() { + super(EntityHorseNPC.class); + } + + @Override + public Horse getBukkitEntity() { + return (Horse) super.getBukkitEntity(); + } + + @Override + public void spawn(Location at, NPC npc) { + npc.getTrait(HorseModifiers.class); + super.spawn(at, npc); + } + + public static class EntityHorseNPC extends EntityHorse implements NPCHolder { + private final CitizensNPC npc; + + public EntityHorseNPC(World world) { + this(world, null); + } + + public EntityHorseNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + ((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication()); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new HorseNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + NMS.setStepHeight(getBukkitEntity(), 1); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class HorseNPC extends CraftHorse implements NPCHolder { + private final CitizensNPC npc; + + public HorseNPC(EntityHorseNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java new file mode 100644 index 000000000..ac4f25eae --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java @@ -0,0 +1,224 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDonkey; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Donkey; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHorseDonkey; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class HorseDonkeyController extends MobEntityController { + public HorseDonkeyController() { + super(EntityHorseDonkeyNPC.class); + } + + @Override + public Donkey getBukkitEntity() { + return (Donkey) super.getBukkitEntity(); + } + + @Override + public void spawn(Location at, NPC npc) { + npc.addTrait(HorseModifiers.class); + super.spawn(at, npc); + } + + public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { + private final CitizensNPC npc; + + public EntityHorseDonkeyNPC(World world) { + this(world, null); + } + + public EntityHorseDonkeyNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication()); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new HorseDonkeyNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + NMS.setStepHeight(getBukkitEntity(), 1); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class HorseDonkeyNPC extends CraftDonkey implements NPCHolder { + private final CitizensNPC npc; + + public HorseDonkeyNPC(EntityHorseDonkeyNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java new file mode 100644 index 000000000..f30c02e83 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java @@ -0,0 +1,224 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMule; +import org.bukkit.entity.Mule; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHorseMule; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class HorseMuleController extends MobEntityController { + public HorseMuleController() { + super(EntityHorseMuleNPC.class); + } + + @Override + public Mule getBukkitEntity() { + return (Mule) super.getBukkitEntity(); + } + + @Override + public void spawn(Location at, NPC npc) { + npc.getTrait(HorseModifiers.class); + super.spawn(at, npc); + } + + public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { + private final CitizensNPC npc; + + public EntityHorseMuleNPC(World world) { + this(world, null); + } + + public EntityHorseMuleNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication()); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new HorseMuleNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + NMS.setStepHeight(getBukkitEntity(), 1); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class HorseMuleNPC extends CraftMule implements NPCHolder { + private final CitizensNPC npc; + + public HorseMuleNPC(EntityHorseMuleNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java new file mode 100644 index 000000000..7875a2a0a --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java @@ -0,0 +1,225 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSkeletonHorse; +import org.bukkit.entity.SkeletonHorse; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHorseSkeleton; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class HorseSkeletonController extends MobEntityController { + public HorseSkeletonController() { + super(EntityHorseSkeletonNPC.class); + } + + @Override + public SkeletonHorse getBukkitEntity() { + return (SkeletonHorse) super.getBukkitEntity(); + } + + @Override + public void spawn(Location at, NPC npc) { + npc.getTrait(HorseModifiers.class); + super.spawn(at, npc); + } + + public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { + private final CitizensNPC npc; + + public EntityHorseSkeletonNPC(World world) { + this(world, null); + } + + public EntityHorseSkeletonNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + ((SkeletonHorse) getBukkitEntity()) + .setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication()); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new HorseSkeletonNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + NMS.setStepHeight(getBukkitEntity(), 1); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class HorseSkeletonNPC extends CraftSkeletonHorse implements NPCHolder { + private final CitizensNPC npc; + + public HorseSkeletonNPC(EntityHorseSkeletonNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java new file mode 100644 index 000000000..16345ba21 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java @@ -0,0 +1,225 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftZombieHorse; +import org.bukkit.entity.ZombieHorse; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHorseZombie; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class HorseZombieController extends MobEntityController { + public HorseZombieController() { + super(EntityHorseZombieNPC.class); + } + + @Override + public ZombieHorse getBukkitEntity() { + return (ZombieHorse) super.getBukkitEntity(); + } + + @Override + public void spawn(Location at, NPC npc) { + npc.getTrait(HorseModifiers.class); + super.spawn(at, npc); + } + + public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { + private final CitizensNPC npc; + + public EntityHorseZombieNPC(World world) { + this(world, null); + } + + public EntityHorseZombieNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + ((ZombieHorse) getBukkitEntity()) + .setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication()); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new HorseZombieNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + NMS.setStepHeight(getBukkitEntity(), 1); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class HorseZombieNPC extends CraftZombieHorse implements NPCHolder { + private final CitizensNPC npc; + + public HorseZombieNPC(EntityHorseZombieNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java new file mode 100644 index 000000000..4c3cfadd9 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java @@ -0,0 +1,153 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import java.util.UUID; +import java.util.regex.Pattern; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.Team; + +import com.mojang.authlib.GameProfile; + +import net.citizensnpcs.Settings.Setting; +import net.citizensnpcs.api.CitizensAPI; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.util.Colorizer; +import net.citizensnpcs.npc.AbstractEntityController; +import net.citizensnpcs.npc.skin.Skin; +import net.citizensnpcs.npc.skin.SkinnableEntity; +import net.citizensnpcs.util.NMS; +import net.minecraft.server.v1_13_R1.PlayerInteractManager; +import net.minecraft.server.v1_13_R1.WorldServer; + +public class HumanController extends AbstractEntityController { + public HumanController() { + super(); + } + + @Override + protected Entity createEntity(final Location at, final NPC npc) { + final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); + String coloredName = Colorizer.parseColors(npc.getFullName()); + + String name = coloredName, prefix = null, suffix = null; + if (coloredName.length() > 16) { + if (coloredName.length() >= 30) { + prefix = coloredName.substring(0, 16); + int len = 30; + name = coloredName.substring(16, 30); + if (NON_ALPHABET_MATCHER.matcher(name).matches()) { + if (coloredName.length() >= 32) { + len = 32; + name = coloredName.substring(16, 32); + } else if (coloredName.length() == 31) { + len = 31; + name = coloredName.substring(16, 31); + } + } else { + name = ChatColor.RESET + name; + } + suffix = coloredName.substring(len); + } else { + prefix = coloredName.substring(0, coloredName.length() - 16); + name = coloredName.substring(prefix.length()); + if (!NON_ALPHABET_MATCHER.matcher(name).matches()) { + name = ChatColor.RESET + name; + } + if (name.length() > 16) { + suffix = name.substring(16); + name = name.substring(0, 16); + } + } + } + + final String prefixCapture = prefix, suffixCapture = suffix; + + UUID uuid = npc.getUniqueId(); + if (uuid.version() == 4) { // clear version + long msb = uuid.getMostSignificantBits(); + msb &= ~0x0000000000004000L; + msb |= 0x0000000000002000L; + uuid = new UUID(msb, uuid.getLeastSignificantBits()); + } + + final GameProfile profile = new GameProfile(uuid, name); + + final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile, + new PlayerInteractManager(nmsWorld), npc); + + Skin skin = handle.getSkinTracker().getSkin(); + if (skin != null) { + skin.apply(handle); + } + + Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() { + @Override + public void run() { + if (getBukkitEntity() == null || !getBukkitEntity().isValid()) + return; + boolean removeFromPlayerList = npc.data().get("removefromplayerlist", + Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); + NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList); + + if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) { + Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + String teamName = profile.getId().toString().substring(0, 16); + + Team team = scoreboard.getTeam(teamName); + if (team == null) { + team = scoreboard.registerNewTeam(teamName); + } + if (prefixCapture != null) { + team.setPrefix(prefixCapture); + } + if (suffixCapture != null) { + team.setSuffix(suffixCapture); + } + team.addPlayer(handle.getBukkitEntity()); + + handle.getNPC().data().set(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA, teamName); + } + } + }, 20); + + handle.getBukkitEntity().setSleepingIgnored(true); + + return handle.getBukkitEntity(); + } + + @Override + public Player getBukkitEntity() { + return (Player) super.getBukkitEntity(); + } + + @Override + public void remove() { + Player entity = getBukkitEntity(); + if (entity != null) { + if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) { + String teamName = entity.getUniqueId().toString().substring(0, 16); + Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + Team team = scoreboard.getTeam(teamName); + if (team != null && team.hasPlayer(entity)) { + if (team.getSize() == 1) { + team.setPrefix(""); + team.setSuffix(""); + } + team.removePlayer(entity); + } + } + NMS.removeFromWorld(entity); + SkinnableEntity npc = entity instanceof SkinnableEntity ? (SkinnableEntity) entity : null; + npc.getSkinTracker().onRemoveNPC(); + } + super.remove(); + } + + private static Pattern NON_ALPHABET_MATCHER = Pattern.compile(".*[^A-Za-z0-9_].*"); +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java new file mode 100644 index 000000000..e0d2bee56 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java @@ -0,0 +1,201 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftIllusioner; +import org.bukkit.entity.Illusioner; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityIllagerIllusioner; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class IllusionerController extends MobEntityController { + public IllusionerController() { + super(EntityIllusionerNPC.class); + } + + @Override + public Illusioner getBukkitEntity() { + return (Illusioner) super.getBukkitEntity(); + } + + public static class EntityIllusionerNPC extends EntityIllagerIllusioner implements NPCHolder { + private final CitizensNPC npc; + + public EntityIllusionerNPC(World world) { + this(world, null); + } + + public EntityIllusionerNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new IllusionerNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class IllusionerNPC extends CraftIllusioner implements NPCHolder { + private final CitizensNPC npc; + + public IllusionerNPC(EntityIllusionerNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java new file mode 100644 index 000000000..85b76f298 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java @@ -0,0 +1,210 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftIronGolem; +import org.bukkit.entity.IronGolem; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityIronGolem; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class IronGolemController extends MobEntityController { + public IronGolemController() { + super(EntityIronGolemNPC.class); + } + + @Override + public IronGolem getBukkitEntity() { + return (IronGolem) super.getBukkitEntity(); + } + + public static class EntityIronGolemNPC extends EntityIronGolem implements NPCHolder { + private final CitizensNPC npc; + + public EntityIronGolemNPC(World world) { + this(world, null); + } + + public EntityIronGolemNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new IronGolemNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class IronGolemNPC extends CraftIronGolem implements NPCHolder { + private final CitizensNPC npc; + + public IronGolemNPC(EntityIronGolemNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java new file mode 100644 index 000000000..c3481a262 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java @@ -0,0 +1,225 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLlama; +import org.bukkit.entity.Llama; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.HorseModifiers; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityLlama; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class LlamaController extends MobEntityController { + public LlamaController() { + super(EntityLlamaNPC.class); + } + + @Override + public Llama getBukkitEntity() { + return (Llama) super.getBukkitEntity(); + } + + @Override + public void spawn(Location at, NPC npc) { + npc.getTrait(HorseModifiers.class); + super.spawn(at, npc); + } + + public static class EntityLlamaNPC extends EntityLlama implements NPCHolder { + private final CitizensNPC npc; + + public EntityLlamaNPC(World world) { + this(world, null); + } + + public EntityLlamaNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication()); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new LlamaNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + if (npc == null) { + super.mobTick(); + } else { + NMS.setStepHeight(getBukkitEntity(), 1); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class LlamaNPC extends CraftLlama implements NPCHolder { + private final CitizensNPC npc; + + public LlamaNPC(EntityLlamaNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java new file mode 100644 index 000000000..0dd838906 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java @@ -0,0 +1,221 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMagmaCube; +import org.bukkit.entity.MagmaCube; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerMove; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntityMagmaCube; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class MagmaCubeController extends MobEntityController { + public MagmaCubeController() { + super(EntityMagmaCubeNPC.class); + } + + @Override + public MagmaCube getBukkitEntity() { + return (MagmaCube) super.getBukkitEntity(); + } + + public static class EntityMagmaCubeNPC extends EntityMagmaCube implements NPCHolder { + private final CitizensNPC npc; + + public EntityMagmaCubeNPC(World world) { + this(world, null); + } + + public EntityMagmaCubeNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + setSize(3, true); + NMSImpl.clearGoals(goalSelector, targetSelector); + this.moveController = new PlayerControllerMove(this); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public void d(EntityHuman human) { + if (npc == null) { + super.d(human); + } + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new MagmaCubeNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class MagmaCubeNPC extends CraftMagmaCube implements NPCHolder { + private final CitizensNPC npc; + + public MagmaCubeNPC(EntityMagmaCubeNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java new file mode 100644 index 000000000..d79d4a01d --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java @@ -0,0 +1,61 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; import net.minecraft.server.v1_13_R1.DamageSource; + +import java.lang.reflect.Constructor; +import java.util.Map; + +import org.bukkit.Location; +import org.bukkit.block.BlockFace; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.entity.Entity; + +import com.google.common.collect.Maps; + +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.npc.AbstractEntityController; +import net.minecraft.server.v1_13_R1.World; + +public abstract class MobEntityController extends AbstractEntityController { + private final Constructor constructor; + + protected MobEntityController(Class clazz) { + super(clazz); + this.constructor = getConstructor(clazz); + } + + @Override + protected Entity createEntity(Location at, NPC npc) { + net.minecraft.server.v1_13_R1.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(), + npc); + entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); + + // entity.onGround isn't updated right away - we approximate here so + // that things like pathfinding still work *immediately* after spawn. + org.bukkit.Material beneath = at.getBlock().getRelative(BlockFace.DOWN).getType(); + if (beneath.isBlock()) { + entity.onGround = true; + } + return entity.getBukkitEntity(); + } + + private net.minecraft.server.v1_13_R1.Entity createEntityFromClass(Object... args) { + try { + return (net.minecraft.server.v1_13_R1.Entity) constructor.newInstance(args); + } catch (Exception ex) { + ex.printStackTrace(); + return null; + } + } + + private static Constructor getConstructor(Class clazz) { + Constructor constructor = CONSTRUCTOR_CACHE.get(clazz); + if (constructor != null) + return constructor; + try { + return clazz.getConstructor(World.class, NPC.class); + } catch (Exception ex) { + throw new IllegalStateException("unable to find an entity constructor"); + } + } + + private static final Map, Constructor> CONSTRUCTOR_CACHE = Maps.newHashMap(); +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java new file mode 100644 index 000000000..1797a3a90 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java @@ -0,0 +1,212 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMushroomCow; +import org.bukkit.entity.MushroomCow; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMushroomCow; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class MushroomCowController extends MobEntityController { + + public MushroomCowController() { + super(EntityMushroomCowNPC.class); + } + + @Override + public MushroomCow getBukkitEntity() { + return (MushroomCow) super.getBukkitEntity(); + } + + public static class EntityMushroomCowNPC extends EntityMushroomCow implements NPCHolder { + private final CitizensNPC npc; + + public EntityMushroomCowNPC(World world) { + this(world, null); + } + + public EntityMushroomCowNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new MushroomCowNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) + npc.update(); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class MushroomCowNPC extends CraftMushroomCow implements NPCHolder { + private final CitizensNPC npc; + + public MushroomCowNPC(EntityMushroomCowNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java new file mode 100644 index 000000000..c0904e343 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java @@ -0,0 +1,220 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftOcelot; +import org.bukkit.entity.Ocelot; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityOcelot; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class OcelotController extends MobEntityController { + public OcelotController() { + super(EntityOcelotNPC.class); + } + + @Override + public Ocelot getBukkitEntity() { + return (Ocelot) super.getBukkitEntity(); + } + + public static class EntityOcelotNPC extends EntityOcelot implements NPCHolder { + private final CitizensNPC npc; + + public EntityOcelotNPC(World world) { + this(world, null); + } + + public EntityOcelotNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + protected void dz() { + if (npc == null) { + super.dz(); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new OcelotNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class OcelotNPC extends CraftOcelot implements NPCHolder { + private final CitizensNPC npc; + + public OcelotNPC(EntityOcelotNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java new file mode 100644 index 000000000..902307b87 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java @@ -0,0 +1,182 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftParrot; +import org.bukkit.entity.Parrot; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntityParrot; +import net.minecraft.server.v1_13_R1.EnumHand; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class ParrotController extends MobEntityController { + public ParrotController() { + super(EntityParrotNPC.class); + } + + @Override + public Parrot getBukkitEntity() { + return (Parrot) super.getBukkitEntity(); + } + + public static class EntityParrotNPC extends EntityParrot implements NPCHolder { + private final CitizensNPC npc; + + public EntityParrotNPC(World world) { + this(world, null); + } + + public EntityParrotNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) { + // block feeding + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + return super.a(paramEntityHuman, paramEnumHand); + } + return false; + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ParrotNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) { + return super.isLeashed(); + } + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + if (npc == null) { + super.mobTick(); + } else { + NMSImpl.updateAI(this); + npc.update(); + } + } + } + + public static class ParrotNPC extends CraftParrot implements NPCHolder { + private final CitizensNPC npc; + + public ParrotNPC(EntityParrotNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java new file mode 100644 index 000000000..4788ae926 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java @@ -0,0 +1,210 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPhantom; +import org.bukkit.entity.Phantom; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityPhantom; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class PhantomController extends MobEntityController { + public PhantomController() { + super(EntityPhantomNPC.class); + } + + @Override + public Phantom getBukkitEntity() { + return (Phantom) super.getBukkitEntity(); + } + + public static class EntityPhantomNPC extends EntityPhantom implements NPCHolder { + private final CitizensNPC npc; + + public EntityPhantomNPC(World world) { + this(world, null); + } + + public EntityPhantomNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + setNoAI(true); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public boolean dq() { + if (npc == null || !npc.isProtected()) + return super.dq(); + return false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new PhantomNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void k() { + if (npc == null) { + super.k(); + } else { + NMSImpl.updateAI(this); + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class PhantomNPC extends CraftPhantom implements NPCHolder { + private final CitizensNPC npc; + + public PhantomNPC(EntityPhantomNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java new file mode 100644 index 000000000..1eb9ab732 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java @@ -0,0 +1,227 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPig; +import org.bukkit.entity.Pig; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityLightning; +import net.minecraft.server.v1_13_R1.EntityPig; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class PigController extends MobEntityController { + public PigController() { + super(EntityPigNPC.class); + } + + @Override + public Pig getBukkitEntity() { + return (Pig) super.getBukkitEntity(); + } + + public static class EntityPigNPC extends EntityPig implements NPCHolder { + private final CitizensNPC npc; + + public EntityPigNPC(World world) { + this(world, null); + } + + public EntityPigNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public boolean dh() { + // block carrot-on-a-stick behaviour + return npc == null ? super.dh() : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new PigNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void onLightningStrike(EntityLightning entitylightning) { + if (npc == null) { + super.onLightningStrike(entitylightning); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class PigNPC extends CraftPig implements NPCHolder { + private final CitizensNPC npc; + + public PigNPC(EntityPigNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java new file mode 100644 index 000000000..229dc262c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java @@ -0,0 +1,203 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPigZombie; +import org.bukkit.entity.PigZombie; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityPigZombie; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class PigZombieController extends MobEntityController { + + public PigZombieController() { + super(EntityPigZombieNPC.class); + } + + @Override + public PigZombie getBukkitEntity() { + return (PigZombie) super.getBukkitEntity(); + } + + public static class EntityPigZombieNPC extends EntityPigZombie implements NPCHolder { + private final CitizensNPC npc; + + public EntityPigZombieNPC(World world) { + this(world, null); + } + + public EntityPigZombieNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.f(x, y, z); + } + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new PigZombieNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class PigZombieNPC extends CraftPigZombie implements NPCHolder { + private final CitizensNPC npc; + + public PigZombieNPC(EntityPigZombieNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java new file mode 100644 index 000000000..81eedafc6 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java @@ -0,0 +1,180 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPolarBear; +import org.bukkit.entity.PolarBear; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityPolarBear; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class PolarBearController extends MobEntityController { + public PolarBearController() { + super(EntityPolarBearNPC.class); + } + + @Override + public PolarBear getBukkitEntity() { + return (PolarBear) super.getBukkitEntity(); + } + + public static class EntityPolarBearNPC extends EntityPolarBear implements NPCHolder { + private final CitizensNPC npc; + + public EntityPolarBearNPC(World world) { + this(world, null); + } + + public EntityPolarBearNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new PolarBearNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) { + return super.isLeashed(); + } + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + } + + public static class PolarBearNPC extends CraftPolarBear implements NPCHolder { + private final CitizensNPC npc; + + public PolarBearNPC(EntityPolarBearNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java new file mode 100644 index 000000000..c0ca3a1e8 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPufferFish; +import org.bukkit.entity.PufferFish; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityPufferFish; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class PufferFishController extends MobEntityController { + public PufferFishController() { + super(EntityPufferFishNPC.class); + } + + @Override + public PufferFish getBukkitEntity() { + return (PufferFish) super.getBukkitEntity(); + } + + public static class EntityPufferFishNPC extends EntityPufferFish implements NPCHolder { + private final CitizensNPC npc; + + public EntityPufferFishNPC(World world) { + this(world, null); + } + + public EntityPufferFishNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new PufferFishNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class PufferFishNPC extends CraftPufferFish implements NPCHolder { + private final CitizensNPC npc; + + public PufferFishNPC(EntityPufferFishNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java new file mode 100644 index 000000000..d1350028c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java @@ -0,0 +1,234 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftRabbit; +import org.bukkit.entity.Rabbit; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_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_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityLiving; +import net.minecraft.server.v1_13_R1.EntityRabbit; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class RabbitController extends MobEntityController { + public RabbitController() { + super(EntityRabbitNPC.class); + } + + @Override + public Rabbit getBukkitEntity() { + return (Rabbit) super.getBukkitEntity(); + } + + public static class EntityRabbitNPC extends EntityRabbit implements NPCHolder { + private final CitizensNPC npc; + + public EntityRabbitNPC(World world) { + this(world, null); + } + + public EntityRabbitNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new RabbitNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public EntityLiving getGoalTarget() { + return npc != null ? null : super.getGoalTarget(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + if (npc != null) { + super.mobTick(); + NMS.setShouldJump(getBukkitEntity()); + npc.update(); + } else { + super.mobTick(); + } + } + + @Override + public void setRabbitType(int i) { + if (npc != null) { + if (NMSImpl.getRabbitTypeField() == null) + return; + this.datawatcher.set(NMSImpl.getRabbitTypeField(), i); + return; + } + super.setRabbitType(i); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class RabbitNPC extends CraftRabbit implements NPCHolder { + private final CitizensNPC npc; + + public RabbitNPC(EntityRabbitNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java new file mode 100644 index 000000000..016df2cef --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSalmon; +import org.bukkit.entity.Salmon; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySalmon; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SalmonController extends MobEntityController { + public SalmonController() { + super(EntitySalmonNPC.class); + } + + @Override + public Salmon getBukkitEntity() { + return (Salmon) super.getBukkitEntity(); + } + + public static class EntitySalmonNPC extends EntitySalmon implements NPCHolder { + private final CitizensNPC npc; + + public EntitySalmonNPC(World world) { + this(world, null); + } + + public EntitySalmonNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SalmonNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class SalmonNPC extends CraftSalmon implements NPCHolder { + private final CitizensNPC npc; + + public SalmonNPC(EntitySalmonNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java new file mode 100644 index 000000000..ee8039567 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java @@ -0,0 +1,211 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSheep; +import org.bukkit.entity.Sheep; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySheep; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SheepController extends MobEntityController { + public SheepController() { + super(EntitySheepNPC.class); + } + + @Override + public Sheep getBukkitEntity() { + return (Sheep) super.getBukkitEntity(); + } + + public static class EntitySheepNPC extends EntitySheep implements NPCHolder { + private final CitizensNPC npc; + + public EntitySheepNPC(World world) { + this(world, null); + } + + public EntitySheepNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new SheepNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) + npc.update(); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class SheepNPC extends CraftSheep implements NPCHolder { + private final CitizensNPC npc; + + public SheepNPC(EntitySheepNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java new file mode 100644 index 000000000..426ef746b --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java @@ -0,0 +1,223 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftShulker; +import org.bukkit.entity.Shulker; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityAIBodyControl; +import net.minecraft.server.v1_13_R1.EntityShulker; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class ShulkerController extends MobEntityController { + public ShulkerController() { + super(EntityShulkerNPC.class); + } + + @Override + public Shulker getBukkitEntity() { + return (Shulker) super.getBukkitEntity(); + } + + public static class EntityShulkerNPC extends EntityShulker implements NPCHolder { + private final CitizensNPC npc; + + public EntityShulkerNPC(World world) { + this(world, null); + } + + public EntityShulkerNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new ShulkerNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void k() { + if (npc == null) { + super.k(); + } + } + + @Override + protected EntityAIBodyControl o() { + return new EntityAIBodyControl(this); + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class ShulkerNPC extends CraftShulker implements NPCHolder { + private final CitizensNPC npc; + + public ShulkerNPC(EntityShulkerNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java new file mode 100644 index 000000000..30d6dc07e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java @@ -0,0 +1,205 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; import net.minecraft.server.v1_13_R1.DamageSource; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSilverfish; +import org.bukkit.entity.Silverfish; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.EntitySilverfish; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SilverfishController extends MobEntityController { + public SilverfishController() { + super(EntitySilverfishNPC.class); + } + + @Override + public Silverfish getBukkitEntity() { + return (Silverfish) super.getBukkitEntity(); + } + + public static class EntitySilverfishNPC extends EntitySilverfish implements NPCHolder { + private final CitizensNPC npc; + + public EntitySilverfishNPC(World world) { + this(world, null); + } + + public EntitySilverfishNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SilverfishNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) + npc.update(); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class SilverfishNPC extends CraftSilverfish implements NPCHolder { + private final CitizensNPC npc; + + public SilverfishNPC(EntitySilverfishNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java new file mode 100644 index 000000000..ec76e7c2b --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java @@ -0,0 +1,209 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSkeleton; +import org.bukkit.entity.Skeleton; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySkeleton; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SkeletonController extends MobEntityController { + public SkeletonController() { + super(EntitySkeletonNPC.class); + } + + @Override + public Skeleton getBukkitEntity() { + return (Skeleton) super.getBukkitEntity(); + } + + public static class EntitySkeletonNPC extends EntitySkeleton implements NPCHolder { + private final CitizensNPC npc; + + public EntitySkeletonNPC(World world) { + this(world, null); + } + + public EntitySkeletonNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SkeletonNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class SkeletonNPC extends CraftSkeleton implements NPCHolder { + private final CitizensNPC npc; + + public SkeletonNPC(EntitySkeletonNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java new file mode 100644 index 000000000..f0b41ab23 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java @@ -0,0 +1,209 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftStray; +import org.bukkit.entity.Stray; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySkeletonStray; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SkeletonStrayController extends MobEntityController { + public SkeletonStrayController() { + super(EntityStrayNPC.class); + } + + @Override + public Stray getBukkitEntity() { + return (Stray) super.getBukkitEntity(); + } + + public static class EntityStrayNPC extends EntitySkeletonStray implements NPCHolder { + private final CitizensNPC npc; + + public EntityStrayNPC(World world) { + this(world, null); + } + + public EntityStrayNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new StrayNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class StrayNPC extends CraftStray implements NPCHolder { + private final CitizensNPC npc; + + public StrayNPC(EntityStrayNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java new file mode 100644 index 000000000..1c122c3fa --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java @@ -0,0 +1,209 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWitherSkeleton; +import org.bukkit.entity.WitherSkeleton; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySkeletonWither; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SkeletonWitherController extends MobEntityController { + public SkeletonWitherController() { + super(EntitySkeletonWitherNPC.class); + } + + @Override + public WitherSkeleton getBukkitEntity() { + return (WitherSkeleton) super.getBukkitEntity(); + } + + public static class EntitySkeletonWitherNPC extends EntitySkeletonWither implements NPCHolder { + private final CitizensNPC npc; + + public EntitySkeletonWitherNPC(World world) { + this(world, null); + } + + public EntitySkeletonWitherNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SkeletonWitherNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class SkeletonWitherNPC extends CraftWitherSkeleton implements NPCHolder { + private final CitizensNPC npc; + + public SkeletonWitherNPC(EntitySkeletonWitherNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java new file mode 100644 index 000000000..109a880fb --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java @@ -0,0 +1,221 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSlime; +import org.bukkit.entity.Slime; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerMove; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntitySlime; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SlimeController extends MobEntityController { + public SlimeController() { + super(EntitySlimeNPC.class); + } + + @Override + public Slime getBukkitEntity() { + return (Slime) super.getBukkitEntity(); + } + + public static class EntitySlimeNPC extends EntitySlime implements NPCHolder { + private final CitizensNPC npc; + + public EntitySlimeNPC(World world) { + this(world, null); + } + + public EntitySlimeNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + setSize(3, true); + NMSImpl.clearGoals(goalSelector, targetSelector); + this.moveController = new PlayerControllerMove(this); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public void d(EntityHuman human) { + if (npc == null) { + super.d(human); + } + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SlimeNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class SlimeNPC extends CraftSlime implements NPCHolder { + private final CitizensNPC npc; + + public SlimeNPC(EntitySlimeNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java new file mode 100644 index 000000000..9bfe89b30 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java @@ -0,0 +1,222 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSnowman; +import org.bukkit.entity.Snowman; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySnowman; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SnowmanController extends MobEntityController { + public SnowmanController() { + super(EntitySnowmanNPC.class); + } + + @Override + public Snowman getBukkitEntity() { + return (Snowman) super.getBukkitEntity(); + } + + public static class EntitySnowmanNPC extends EntitySnowman implements NPCHolder { + private final CitizensNPC npc; + + public EntitySnowmanNPC(World world) { + this(world, null); + } + + public EntitySnowmanNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SnowmanNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void k() { + boolean allowsGriefing = this.world.getGameRules().getBoolean("mobGriefing"); + if (npc != null) { + this.world.getGameRules().set("mobGriefing", "false", this.world.getMinecraftServer()); + } + super.k(); + if (npc != null) { + this.world.getGameRules().set("mobGriefing", Boolean.toString(allowsGriefing), + this.world.getMinecraftServer()); + } + } + + @Override + public void mobTick() { + super.mobTick(); + 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); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class SnowmanNPC extends CraftSnowman implements NPCHolder { + private final CitizensNPC npc; + + public SnowmanNPC(EntitySnowmanNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java new file mode 100644 index 000000000..31fea00eb --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java @@ -0,0 +1,209 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSpider; +import org.bukkit.entity.Spider; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySpider; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SpiderController extends MobEntityController { + public SpiderController() { + super(EntitySpiderNPC.class); + } + + @Override + public Spider getBukkitEntity() { + return (Spider) super.getBukkitEntity(); + } + + public static class EntitySpiderNPC extends EntitySpider implements NPCHolder { + private final CitizensNPC npc; + + public EntitySpiderNPC(World world) { + this(world, null); + } + + public EntitySpiderNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SpiderNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) + npc.update(); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + + } + + public static class SpiderNPC extends CraftSpider implements NPCHolder { + private final CitizensNPC npc; + + public SpiderNPC(EntitySpiderNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java new file mode 100644 index 000000000..036d01ca1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java @@ -0,0 +1,201 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSquid; +import org.bukkit.entity.Squid; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntitySquid; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class SquidController extends MobEntityController { + public SquidController() { + super(EntitySquidNPC.class); + } + + @Override + public Squid getBukkitEntity() { + return (Squid) super.getBukkitEntity(); + } + + public static class EntitySquidNPC extends EntitySquid implements NPCHolder { + private final CitizensNPC npc; + + public EntitySquidNPC(World world) { + this(world, null); + } + + public EntitySquidNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new SquidNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class SquidNPC extends CraftSquid implements NPCHolder { + private final CitizensNPC npc; + + public SquidNPC(EntitySquidNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java new file mode 100644 index 000000000..ba4228804 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTropicalFish; +import org.bukkit.entity.TropicalFish; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityTropicalFish; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class TropicalFishController extends MobEntityController { + public TropicalFishController() { + super(EntityTropicalFishNPC.class); + } + + @Override + public TropicalFish getBukkitEntity() { + return (TropicalFish) super.getBukkitEntity(); + } + + public static class EntityTropicalFishNPC extends EntityTropicalFish implements NPCHolder { + private final CitizensNPC npc; + + public EntityTropicalFishNPC(World world) { + this(world, null); + } + + public EntityTropicalFishNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new TropicalFishNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class TropicalFishNPC extends CraftTropicalFish implements NPCHolder { + private final CitizensNPC npc; + + public TropicalFishNPC(EntityTropicalFishNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java new file mode 100644 index 000000000..fb06595f4 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTurtle; +import org.bukkit.entity.Turtle; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityTurtle; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class TurtleController extends MobEntityController { + public TurtleController() { + super(EntityTurtleNPC.class); + } + + @Override + public Turtle getBukkitEntity() { + return (Turtle) super.getBukkitEntity(); + } + + public static class EntityTurtleNPC extends EntityTurtle implements NPCHolder { + private final CitizensNPC npc; + + public EntityTurtleNPC(World world) { + this(world, null); + } + + public EntityTurtleNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new TurtleNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class TurtleNPC extends CraftTurtle implements NPCHolder { + private final CitizensNPC npc; + + public TurtleNPC(EntityTurtleNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java new file mode 100644 index 000000000..c513e4c01 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java @@ -0,0 +1,169 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVex; +import org.bukkit.entity.Vex; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityVex; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class VexController extends MobEntityController { + public VexController() { + super(EntityVexNPC.class); + } + + @Override + public Vex getBukkitEntity() { + return (Vex) super.getBukkitEntity(); + } + + public static class EntityVexNPC extends EntityVex implements NPCHolder { + private final CitizensNPC npc; + + public EntityVexNPC(World world) { + this(world, null); + } + + public EntityVexNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + setNoGravity(true); + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new VexNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) { + return super.isLeashed(); + } + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + } + + public static class VexNPC extends CraftVex implements NPCHolder { + private final CitizensNPC npc; + + public VexNPC(EntityVexNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java new file mode 100644 index 000000000..0102418cb --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java @@ -0,0 +1,256 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import java.util.List; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVillager; +import org.bukkit.entity.Villager; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntityLightning; +import net.minecraft.server.v1_13_R1.EntityVillager; +import net.minecraft.server.v1_13_R1.EnumHand; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.MerchantRecipe; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class VillagerController extends MobEntityController { + public VillagerController() { + super(EntityVillagerNPC.class); + } + + @Override + public Villager getBukkitEntity() { + return (Villager) super.getBukkitEntity(); + } + + public static class EntityVillagerNPC extends EntityVillager implements NPCHolder { + private boolean blockingATrade; + private boolean blockTrades = true; + private final CitizensNPC npc; + + public EntityVillagerNPC(World world) { + this(world, null); + } + + public EntityVillagerNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public boolean a(EntityHuman entityhuman, EnumHand enumhand) { + if (npc != null && blockTrades) { + blockingATrade = true; + List list = getOffers(entityhuman); + if (list != null) { + list.clear(); + } + } + return super.a(entityhuman, enumhand); + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public boolean dB() { + if (blockingATrade) { + blockingATrade = false; + return true; + } + return super.dB(); + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new VillagerNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + public boolean isBlockingTrades() { + return blockTrades; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void onLightningStrike(EntityLightning entitylightning) { + if (npc == null) { + super.onLightningStrike(entitylightning); + } + } + + public void setBlockTrades(boolean blocked) { + this.blockTrades = blocked; + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class VillagerNPC extends CraftVillager implements NPCHolder { + private final CitizensNPC npc; + + public VillagerNPC(EntityVillagerNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java new file mode 100644 index 000000000..4ac0fc5d8 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java @@ -0,0 +1,212 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVindicator; +import org.bukkit.entity.Vindicator; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityVindicator; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class VindicatorController extends MobEntityController { + public VindicatorController() { + super(EntityVindicatorNPC.class); + } + + @Override + public Vindicator getBukkitEntity() { + return (Vindicator) super.getBukkitEntity(); + } + + public static class EntityVindicatorNPC extends EntityVindicator implements NPCHolder { + private final CitizensNPC npc; + + public EntityVindicatorNPC(World world) { + this(world, null); + } + + public EntityVindicatorNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new VindicatorNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class VindicatorNPC extends CraftVindicator implements NPCHolder { + private final CitizensNPC npc; + + public VindicatorNPC(EntityVindicatorNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java new file mode 100644 index 000000000..15fd3bf3f --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java @@ -0,0 +1,208 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWitch; +import org.bukkit.entity.Witch; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityWitch; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class WitchController extends MobEntityController { + public WitchController() { + super(EntityWitchNPC.class); + } + + @Override + public Witch getBukkitEntity() { + return (Witch) super.getBukkitEntity(); + } + + public static class EntityWitchNPC extends EntityWitch implements NPCHolder { + private final CitizensNPC npc; + + public EntityWitchNPC(World world) { + this(world, null); + } + + public EntityWitchNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new WitchNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) + npc.update(); + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + } + + public static class WitchNPC extends CraftWitch implements NPCHolder { + private final CitizensNPC npc; + + public WitchNPC(EntityWitchNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java new file mode 100644 index 000000000..c5c3018fd --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java @@ -0,0 +1,172 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWither; +import org.bukkit.entity.Wither; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityWither; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class WitherController extends MobEntityController { + public WitherController() { + super(EntityWitherNPC.class); + } + + @Override + public Wither getBukkitEntity() { + return (Wither) super.getBukkitEntity(); + } + + public static class EntityWitherNPC extends EntityWither implements NPCHolder { + private final CitizensNPC npc; + + public EntityWitherNPC(World world) { + this(world, null); + } + + public EntityWitherNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new WitherNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public int m(int i) { + return npc == null ? super.m(i) : 0; + } + + @Override + protected void mobTick() { + if (npc == null) { + super.mobTick(); + } else { + npc.update(); + } + } + } + + public static class WitherNPC extends CraftWither implements NPCHolder { + private final CitizensNPC npc; + + public WitherNPC(EntityWitherNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java new file mode 100644 index 000000000..c191b0aa6 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java @@ -0,0 +1,224 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWolf; +import org.bukkit.entity.Wolf; +import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityLiving; +import net.minecraft.server.v1_13_R1.EntityWolf; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class WolfController extends MobEntityController { + public WolfController() { + super(EntityWolfNPC.class); + } + + @Override + public Wolf getBukkitEntity() { + return (Wolf) super.getBukkitEntity(); + } + + public static class EntityWolfNPC extends EntityWolf implements NPCHolder { + private final CitizensNPC npc; + + public EntityWolfNPC(World world) { + this(world, null); + } + + public EntityWolfNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + public void a(boolean flag) { + float oldw = width; + float oldl = length; + super.a(flag); + if (oldw != width || oldl != length) { + this.setPosition(locX - 0.01, locY, locZ - 0.01); + this.setPosition(locX + 0.01, locY, locZ + 0.01); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new WolfNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + + @Override + public boolean setGoalTarget(EntityLiving entityliving, EntityTargetEvent.TargetReason reason, boolean fire) { + return npc == null || this.equals(entityliving) ? super.setGoalTarget(entityliving, reason, fire) : false; + } + } + + public static class WolfNPC extends CraftWolf implements NPCHolder { + private final CitizensNPC npc; + + public WolfNPC(EntityWolfNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void setSitting(boolean sitting) { + getHandle().setSitting(sitting); + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java new file mode 100644 index 000000000..cfd811dc1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftZombie; +import org.bukkit.entity.Zombie; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityZombie; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class ZombieController extends MobEntityController { + public ZombieController() { + super(EntityZombieNPC.class); + } + + @Override + public Zombie getBukkitEntity() { + return (Zombie) super.getBukkitEntity(); + } + + public static class EntityZombieNPC extends EntityZombie implements NPCHolder { + private final CitizensNPC npc; + + public EntityZombieNPC(World world) { + this(world, null); + } + + public EntityZombieNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new ZombieNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class ZombieNPC extends CraftZombie implements NPCHolder { + private final CitizensNPC npc; + + public ZombieNPC(EntityZombieNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java new file mode 100644 index 000000000..909c4097e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftHusk; +import org.bukkit.entity.Husk; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityZombieHusk; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class ZombieHuskController extends MobEntityController { + public ZombieHuskController() { + super(EntityZombieHuskNPC.class); + } + + @Override + public Husk getBukkitEntity() { + return (Husk) super.getBukkitEntity(); + } + + public static class EntityZombieHuskNPC extends EntityZombieHusk implements NPCHolder { + private final CitizensNPC npc; + + public EntityZombieHuskNPC(World world) { + this(world, null); + } + + public EntityZombieHuskNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + protected SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 + protected SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + protected SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new ZombieHuskNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class ZombieHuskNPC extends CraftHusk implements NPCHolder { + private final CitizensNPC npc; + + public ZombieHuskNPC(EntityZombieHuskNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java new file mode 100644 index 000000000..3908323ca --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java @@ -0,0 +1,200 @@ +package net.citizensnpcs.nms.v1_13_R1.entity; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVillagerZombie; +import org.bukkit.entity.ZombieVillager; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCEnderTeleportEvent; +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityZombieVillager; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.World; + +public class ZombieVillagerController extends MobEntityController { + public ZombieVillagerController() { + super(EntityZombieVillagerNPC.class); + } + + @Override + public ZombieVillager getBukkitEntity() { + return (ZombieVillager) super.getBukkitEntity(); + } + + public static class EntityZombieVillagerNPC extends EntityZombieVillager implements NPCHolder { + private final CitizensNPC npc; + + public EntityZombieVillagerNPC(World world) { + this(world, null); + } + + public EntityZombieVillagerNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + if (npc != null) { + NMSImpl.clearGoals(goalSelector, targetSelector); + } + } + + @Override + protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } + } + + @Override + public void a(float f, float f1, float f2) { + if (npc == null || !npc.isFlyable()) { + super.a(f, f1, f2); + } else { + NMSImpl.flyingMoveLogic(this, f, f1, f2); + } + } + + @Override + public SoundEffect cr() { + return NMSImpl.getSoundEffect(npc, super.cr(), NPC.DEATH_SOUND_METADATA); + } + + @Override + public void collide(net.minecraft.server.v1_13_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 SoundEffect d(DamageSource damagesource) { + return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void c(float f, float f1) { + if (npc == null || !npc.isFlyable()) { + super.c(f, f1); + } + } + + @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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public SoundEffect D() { + return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA); + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) + bukkitEntity = new ZombieVillagerNPC(this); + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean isLeashed() { + if (npc == null) + return super.isLeashed(); + boolean protectedDefault = npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true); + if (!protectedDefault || !npc.data().get(NPC.LEASH_PROTECTED_METADATA, protectedDefault)) + return super.isLeashed(); + if (super.isLeashed()) { + unleash(true, false); // clearLeash with client update + } + return false; // shouldLeash + } + + @Override + protected void I() { + if (npc == null) { + super.I(); + } + } + + @Override + public void mobTick() { + super.mobTick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public boolean z_() { + if (npc == null || !npc.isFlyable()) { + return super.z_(); + } else { + return false; + } + } + } + + public static class ZombieVillagerNPC extends CraftVillagerZombie implements NPCHolder { + private final CitizensNPC npc; + + public ZombieVillagerNPC(EntityZombieVillagerNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java new file mode 100644 index 000000000..f18bea02e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftAreaEffectCloud; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.AreaEffectCloud; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityAreaEffectCloud; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class AreaEffectCloudController extends MobEntityController { + public AreaEffectCloudController() { + super(EntityAreaEffectCloudNPC.class); + } + + @Override + public AreaEffectCloud getBukkitEntity() { + return (AreaEffectCloud) super.getBukkitEntity(); + } + + public static class AreaEffectCloudNPC extends CraftAreaEffectCloud implements NPCHolder { + private final CitizensNPC npc; + + public AreaEffectCloudNPC(EntityAreaEffectCloudNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityAreaEffectCloudNPC extends EntityAreaEffectCloud implements NPCHolder { + private final CitizensNPC npc; + + public EntityAreaEffectCloudNPC(World world) { + this(world, null); + } + + public EntityAreaEffectCloudNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new AreaEffectCloudNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java new file mode 100644 index 000000000..ada5c9173 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java @@ -0,0 +1,131 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_13_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.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityArmorStand; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EnumHand; +import net.minecraft.server.v1_13_R1.EnumInteractionResult; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.Vec3D; +import net.minecraft.server.v1_13_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 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 tick() { + super.tick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java new file mode 100644 index 000000000..ec50d937d --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java @@ -0,0 +1,125 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Boat; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityBoat; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class BoatController extends MobEntityController { + public BoatController() { + super(EntityBoatNPC.class); + } + + @Override + public Boat getBukkitEntity() { + return (Boat) super.getBukkitEntity(); + } + + public static class BoatNPC extends CraftBoat implements NPCHolder { + private final CitizensNPC npc; + + public BoatNPC(EntityBoatNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityBoatNPC extends EntityBoat implements NPCHolder { + private final CitizensNPC npc; + + public EntityBoatNPC(World world) { + this(world, null); + } + + public EntityBoatNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new BoatNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java new file mode 100644 index 000000000..6720d791a --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java @@ -0,0 +1,128 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDragonFireball; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.DragonFireball; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityDragonFireball; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class DragonFireballController extends MobEntityController { + public DragonFireballController() { + super(EntityDragonFireballNPC.class); + } + + @Override + public DragonFireball getBukkitEntity() { + return (DragonFireball) super.getBukkitEntity(); + } + + public static class DragonFireballNPC extends CraftDragonFireball implements NPCHolder { + private final CitizensNPC npc; + + public DragonFireballNPC(EntityDragonFireballNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityDragonFireballNPC extends EntityDragonFireball implements NPCHolder { + private final CitizensNPC npc; + + public EntityDragonFireballNPC(World world) { + this(world, null); + } + + public EntityDragonFireballNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new DragonFireballNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + + @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_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java new file mode 100644 index 000000000..8fe189229 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java @@ -0,0 +1,134 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.npc.AbstractEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityEgg; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; +import net.minecraft.server.v1_13_R1.WorldServer; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEgg; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Egg; +import org.bukkit.entity.Entity; +import org.bukkit.util.Vector; + +public class EggController extends AbstractEntityController { + public EggController() { + super(EntityEggNPC.class); + } + + @Override + protected Entity createEntity(Location at, NPC npc) { + WorldServer ws = ((CraftWorld) at.getWorld()).getHandle(); + final EntityEggNPC handle = new EntityEggNPC(ws, npc, at.getX(), at.getY(), at.getZ()); + return handle.getBukkitEntity(); + } + + @Override + public Egg getBukkitEntity() { + return (Egg) super.getBukkitEntity(); + } + + public static class EggNPC extends CraftEgg implements NPCHolder { + private final CitizensNPC npc; + + public EggNPC(EntityEggNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEggNPC extends EntityEgg implements NPCHolder { + private final CitizensNPC npc; + + public EntityEggNPC(World world) { + this(world, null); + } + + public EntityEggNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + public EntityEggNPC(World world, NPC npc, double d0, double d1, double d2) { + super(world, d0, d1, d2); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EggNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java new file mode 100644 index 000000000..58d2b4431 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityEnderCrystal; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderCrystal; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.EnderCrystal; +import org.bukkit.util.Vector; + +public class EnderCrystalController extends MobEntityController { + public EnderCrystalController() { + super(EntityEnderCrystalNPC.class); + } + + @Override + public EnderCrystal getBukkitEntity() { + return (EnderCrystal) super.getBukkitEntity(); + } + + public static class EnderCrystalNPC extends CraftEnderCrystal implements NPCHolder { + private final CitizensNPC npc; + + public EnderCrystalNPC(EntityEnderCrystalNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEnderCrystalNPC extends EntityEnderCrystal implements NPCHolder { + private final CitizensNPC npc; + + public EntityEnderCrystalNPC(World world) { + this(world, null); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + public EntityEnderCrystalNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EnderCrystalNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java new file mode 100644 index 000000000..52600f2a6 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java @@ -0,0 +1,118 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderPearl; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.EnderPearl; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityEnderPearl; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class EnderPearlController extends MobEntityController { + public EnderPearlController() { + super(EntityEnderPearlNPC.class); + } + + @Override + public EnderPearl getBukkitEntity() { + return (EnderPearl) super.getBukkitEntity(); + } + + public static class EnderPearlNPC extends CraftEnderPearl implements NPCHolder { + private final CitizensNPC npc; + + public EnderPearlNPC(EntityEnderPearlNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEnderPearlNPC extends EntityEnderPearl implements NPCHolder { + private final CitizensNPC npc; + + public EntityEnderPearlNPC(World world) { + this(world, null); + } + + public EntityEnderPearlNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EnderPearlNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java new file mode 100644 index 000000000..2d8428858 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityEnderSignal; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderSignal; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.EnderSignal; +import org.bukkit.util.Vector; + +public class EnderSignalController extends MobEntityController { + public EnderSignalController() { + super(EntityEnderSignalNPC.class); + } + + @Override + public EnderSignal getBukkitEntity() { + return (EnderSignal) super.getBukkitEntity(); + } + + public static class EnderSignalNPC extends CraftEnderSignal implements NPCHolder { + private final CitizensNPC npc; + + public EnderSignalNPC(EntityEnderSignalNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntityEnderSignalNPC extends EntityEnderSignal implements NPCHolder { + private final CitizensNPC npc; + + public EntityEnderSignalNPC(World world) { + this(world, null); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + public EntityEnderSignalNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EnderSignalNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java new file mode 100644 index 000000000..2e329bd08 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java @@ -0,0 +1,131 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEvokerFangs; +import org.bukkit.entity.EvokerFangs; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerInteractEntityEvent; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityEvokerFangs; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EnumHand; +import net.minecraft.server.v1_13_R1.EnumInteractionResult; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.Vec3D; +import net.minecraft.server.v1_13_R1.World; + +public class EvokerFangsController extends MobEntityController { + public EvokerFangsController() { + super(EntityEvokerFangsNPC.class); + } + + @Override + public EvokerFangs getBukkitEntity() { + return (EvokerFangs) super.getBukkitEntity(); + } + + public static class EntityEvokerFangsNPC extends EntityEvokerFangs implements NPCHolder { + private final CitizensNPC npc; + + public EntityEvokerFangsNPC(World world) { + this(world, null); + } + + public EntityEvokerFangsNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @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 tick() { + super.tick(); + if (npc != null) { + npc.update(); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new EvokerFangsNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EvokerFangsNPC extends CraftEvokerFangs implements NPCHolder { + private final CitizensNPC npc; + + public EvokerFangsNPC(EntityEvokerFangsNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java new file mode 100644 index 000000000..ffc00232e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityExperienceOrb; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftExperienceOrb; +import org.bukkit.entity.ExperienceOrb; +import org.bukkit.util.Vector; + +public class ExperienceOrbController extends MobEntityController { + public ExperienceOrbController() { + super(EntityExperienceOrbNPC.class); + } + + @Override + public ExperienceOrb getBukkitEntity() { + return (ExperienceOrb) super.getBukkitEntity(); + } + + public static class EntityExperienceOrbNPC extends EntityExperienceOrb implements NPCHolder { + private final CitizensNPC npc; + + public EntityExperienceOrbNPC(World world) { + this(world, null); + } + + public EntityExperienceOrbNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ExperienceOrbNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class ExperienceOrbNPC extends CraftExperienceOrb implements NPCHolder { + private final CitizensNPC npc; + + public ExperienceOrbNPC(EntityExperienceOrbNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java new file mode 100644 index 000000000..29d6707bf --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java @@ -0,0 +1,172 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftFallingBlock; +import org.bukkit.craftbukkit.v1_13_R1.util.CraftMagicNumbers; +import org.bukkit.entity.Entity; +import org.bukkit.entity.FallingBlock; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.AbstractEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.Block; +import net.minecraft.server.v1_13_R1.Blocks; +import net.minecraft.server.v1_13_R1.EntityFallingBlock; +import net.minecraft.server.v1_13_R1.EnumMoveType; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; +import net.minecraft.server.v1_13_R1.WorldServer; + +public class FallingBlockController extends AbstractEntityController { + public FallingBlockController() { + super(EntityFallingBlockNPC.class); + } + + @Override + protected Entity createEntity(Location at, NPC npc) { + WorldServer ws = ((CraftWorld) at.getWorld()).getHandle(); + Block id = Blocks.STONE; + int data = npc.data().get(NPC.ITEM_DATA_METADATA, npc.data().get("falling-block-data", 0)); + // TODO: how to incorporate this - probably delete? + if (npc.data().has("falling-block-id") || npc.data().has(NPC.ITEM_ID_METADATA)) { + id = CraftMagicNumbers.getBlock(Material.getMaterial( + npc.data(). get(NPC.ITEM_ID_METADATA, npc.data(). get("falling-block-id")))); + } + final EntityFallingBlockNPC handle = new EntityFallingBlockNPC(ws, npc, at.getX(), at.getY(), at.getZ(), + id.getBlockData()); + return handle.getBukkitEntity(); + } + + @Override + public FallingBlock getBukkitEntity() { + return (FallingBlock) super.getBukkitEntity(); + } + + public static class EntityFallingBlockNPC extends EntityFallingBlock implements NPCHolder { + private final CitizensNPC npc; + + public EntityFallingBlockNPC(World world) { + this(world, null); + } + + public EntityFallingBlockNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + public EntityFallingBlockNPC(World world, NPC npc, double d0, double d1, double d2, IBlockData data) { + super(world, d0, d1, d2, data); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new FallingBlockNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (Math.abs(motX) > EPSILON || Math.abs(motY) > EPSILON || Math.abs(motZ) > EPSILON) { + motX *= 0.98; + motY *= 0.98; + motZ *= 0.98; + move(EnumMoveType.SELF, motX, motY, motZ); + } + } else { + super.tick(); + } + } + + private static final double EPSILON = 0.001; + } + + public static class FallingBlockNPC extends CraftFallingBlock implements NPCHolder { + private final CitizensNPC npc; + + public FallingBlockNPC(EntityFallingBlockNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + + public void setType(Material material, int data) { + npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); + npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); + if (npc.isSpawned()) { + npc.despawn(); + npc.spawn(npc.getStoredLocation()); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java new file mode 100644 index 000000000..ebc9e1649 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityFireworks; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftFirework; +import org.bukkit.entity.Firework; +import org.bukkit.util.Vector; + +public class FireworkController extends MobEntityController { + public FireworkController() { + super(EntityFireworkNPC.class); + } + + @Override + public Firework getBukkitEntity() { + return (Firework) super.getBukkitEntity(); + } + + public static class EntityFireworkNPC extends EntityFireworks implements NPCHolder { + private final CitizensNPC npc; + + public EntityFireworkNPC(World world) { + this(world, null); + } + + public EntityFireworkNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new FireworkNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class FireworkNPC extends CraftFirework implements NPCHolder { + private final CitizensNPC npc; + + public FireworkNPC(EntityFireworkNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java new file mode 100644 index 000000000..00e05c9b0 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftFishHook; +import org.bukkit.entity.FishHook; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityFishingHook; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class FishingHookController extends MobEntityController { + public FishingHookController() { + super(EntityFishingHookNPC.class); + } + + @Override + public FishHook getBukkitEntity() { + return (FishHook) super.getBukkitEntity(); + } + + public static class EntityFishingHookNPC extends EntityFishingHook implements NPCHolder { + private final CitizensNPC npc; + + public EntityFishingHookNPC(World world) { + this(world, null); + } + + public EntityFishingHookNPC(World world, NPC npc) { + super(world, null); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new FishingHookNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class FishingHookNPC extends CraftFishHook implements NPCHolder { + private final CitizensNPC npc; + + public FishingHookNPC(EntityFishingHookNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java new file mode 100644 index 000000000..a5a8a974e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java @@ -0,0 +1,153 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.npc.AbstractEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntityItem; +import net.minecraft.server.v1_13_R1.ItemStack; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; +import net.minecraft.server.v1_13_R1.WorldServer; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftItem; +import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftItemStack; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Item; +import org.bukkit.util.Vector; + +public class ItemController extends AbstractEntityController { + public ItemController() { + super(EntityItemNPC.class); + } + + @Override + protected Entity createEntity(Location at, NPC npc) { + WorldServer ws = ((CraftWorld) at.getWorld()).getHandle(); + Material id = Material.STONE; + int data = npc.data().get(NPC.ITEM_DATA_METADATA, npc.data().get("falling-block-data", 0)); + if (npc.data().has(NPC.ITEM_ID_METADATA)) { + id = Material.getMaterial(npc.data(). get(NPC.ITEM_ID_METADATA)); + } + final EntityItemNPC handle = new EntityItemNPC(ws, npc, at.getX(), at.getY(), at.getZ(), + CraftItemStack.asNMSCopy(new org.bukkit.inventory.ItemStack(id, 1, (short) data))); + return handle.getBukkitEntity(); + } + + @Override + public Item getBukkitEntity() { + return (Item) super.getBukkitEntity(); + } + + public static class EntityItemNPC extends EntityItem implements NPCHolder { + private final CitizensNPC npc; + + public EntityItemNPC(World world) { + super(world); + this.npc = null; + } + + public EntityItemNPC(World world, NPC npc, double x, double y, double z, ItemStack stack) { + super(world, x, y, z, stack); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void d(EntityHuman entityhuman) { + if (npc == null) { + super.d(entityhuman); + } + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ItemNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class ItemNPC extends CraftItem implements NPCHolder { + private final CitizensNPC npc; + + public ItemNPC(EntityItemNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + + public void setType(Material material, int data) { + npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); + npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); + if (npc.isSpawned()) { + npc.despawn(); + npc.spawn(npc.getStoredLocation()); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java new file mode 100644 index 000000000..0b46a1973 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java @@ -0,0 +1,150 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftItemFrame; +import org.bukkit.entity.Entity; +import org.bukkit.entity.ItemFrame; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.EntityItemFrame; +import net.minecraft.server.v1_13_R1.EnumDirection; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class ItemFrameController extends MobEntityController { + public ItemFrameController() { + super(EntityItemFrameNPC.class); + } + + @Override + protected Entity createEntity(Location at, NPC npc) { + Entity e = super.createEntity(at, npc); + EntityItemFrame item = (EntityItemFrame) ((CraftEntity) e).getHandle(); + item.setDirection(EnumDirection.EAST); + item.blockPosition = new BlockPosition(at.getX(), at.getY(), at.getZ()); + return e; + } + + @Override + public ItemFrame getBukkitEntity() { + return (ItemFrame) super.getBukkitEntity(); + } + + public static class EntityItemFrameNPC extends EntityItemFrame implements NPCHolder { + private final CitizensNPC npc; + + public EntityItemFrameNPC(World world) { + this(world, null); + } + + public EntityItemFrameNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ItemFrameNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public boolean survives() { + return npc == null || !npc.isProtected() ? super.survives() : true; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class ItemFrameNPC extends CraftItemFrame implements NPCHolder { + private final CitizensNPC npc; + + public ItemFrameNPC(EntityItemFrameNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + Material id = Material.STONE; + int data = npc.data().get(NPC.ITEM_DATA_METADATA, npc.data().get("falling-block-data", 0)); + if (npc.data().has(NPC.ITEM_ID_METADATA)) { + id = Material.getMaterial(npc.data(). get(NPC.ITEM_ID_METADATA)); + } + getItem().setType(id); + getItem().setDurability((short) data); + } + + @Override + public NPC getNPC() { + return npc; + } + + public void setType(Material material, int data) { + npc.data().setPersistent(NPC.ITEM_ID_METADATA, material.name()); + npc.data().setPersistent(NPC.ITEM_DATA_METADATA, data); + if (npc.isSpawned()) { + npc.despawn(); + npc.spawn(npc.getStoredLocation()); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java new file mode 100644 index 000000000..2e28def21 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java @@ -0,0 +1,128 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLargeFireball; +import org.bukkit.entity.LargeFireball; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityLargeFireball; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class LargeFireballController extends MobEntityController { + public LargeFireballController() { + super(EntityLargeFireballNPC.class); + } + + @Override + public LargeFireball getBukkitEntity() { + return (LargeFireball) super.getBukkitEntity(); + } + + public static class EntityLargeFireballNPC extends EntityLargeFireball implements NPCHolder { + private final CitizensNPC npc; + + public EntityLargeFireballNPC(World world) { + this(world, null); + } + + public EntityLargeFireballNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new LargeFireballNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void setSize(float f, float f1) { + if (npc == null) { + super.setSize(f, f1); + } else { + NMSImpl.setSize(this, f, f1, justCreated); + } + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + } + + public static class LargeFireballNPC extends CraftLargeFireball implements NPCHolder { + private final CitizensNPC npc; + + public LargeFireballNPC(EntityLargeFireballNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java new file mode 100644 index 000000000..06b5482e1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java @@ -0,0 +1,120 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityLeash; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLeash; +import org.bukkit.entity.LeashHitch; +import org.bukkit.util.Vector; + +public class LeashController extends MobEntityController { + public LeashController() { + super(EntityLeashNPC.class); + } + + @Override + public LeashHitch getBukkitEntity() { + return (LeashHitch) super.getBukkitEntity(); + } + + public static class EntityLeashNPC extends EntityLeash implements NPCHolder { + private final CitizensNPC npc; + + public EntityLeashNPC(World world) { + this(world, null); + } + + public EntityLeashNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new LeashNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + + @Override + public boolean survives() { + return npc == null || !npc.isProtected() ? super.survives() : true; + } + } + + public static class LeashNPC extends CraftLeash implements NPCHolder { + private final CitizensNPC npc; + + public LeashNPC(EntityLeashNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java new file mode 100644 index 000000000..430cc03c8 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java @@ -0,0 +1,136 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLlamaSpit; +import org.bukkit.entity.Entity; +import org.bukkit.entity.LlamaSpit; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.npc.AbstractEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityLlama; +import net.minecraft.server.v1_13_R1.EntityLlamaSpit; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; +import net.minecraft.server.v1_13_R1.WorldServer; + +public class LlamaSpitController extends AbstractEntityController { + public LlamaSpitController() { + super(EntityLlamaSpitNPC.class); + } + + @Override + protected Entity createEntity(Location at, NPC npc) { + WorldServer ws = ((CraftWorld) at.getWorld()).getHandle(); + final EntityLlamaSpitNPC handle = new EntityLlamaSpitNPC(ws, npc); + handle.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getPitch(), at.getYaw()); + return handle.getBukkitEntity(); + } + + @Override + public LlamaSpit getBukkitEntity() { + return (LlamaSpit) super.getBukkitEntity(); + } + + public static class EntityLlamaSpitNPC extends EntityLlamaSpit implements NPCHolder { + private final CitizensNPC npc; + + public EntityLlamaSpitNPC(World world) { + this(world, null); + } + + public EntityLlamaSpitNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + public EntityLlamaSpitNPC(World world, NPC npc, EntityLlama entity) { + super(world, entity); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new LlamaSpitNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class LlamaSpitNPC extends CraftLlamaSpit implements NPCHolder { + private final CitizensNPC npc; + + public LlamaSpitNPC(EntityLlamaSpitNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java new file mode 100644 index 000000000..1dc4a716c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java @@ -0,0 +1,125 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartChest; +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartChest; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartChestController extends MobEntityController { + public MinecartChestController() { + super(EntityMinecartChestNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartChestNPC extends EntityMinecartChest implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartChestNPC(World world) { + this(world, null); + } + + public EntityMinecartChestNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new MinecartChestNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + } + + public static class MinecartChestNPC extends CraftMinecartChest implements NPCHolder { + private final CitizensNPC npc; + + public MinecartChestNPC(EntityMinecartChestNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java new file mode 100644 index 000000000..5ac6b0ff7 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java @@ -0,0 +1,124 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartCommand; +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartCommandBlock; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartCommandController extends MobEntityController { + public MinecartCommandController() { + super(EntityMinecartCommandNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartCommandNPC extends EntityMinecartCommandBlock implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartCommandNPC(World world) { + this(world, null); + } + + public EntityMinecartCommandNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new MinecartCommandNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class MinecartCommandNPC extends CraftMinecartCommand implements NPCHolder { + private final CitizensNPC npc; + + public MinecartCommandNPC(EntityMinecartCommandNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java new file mode 100644 index 000000000..98cfa784e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java @@ -0,0 +1,124 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartFurnace; +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartFurnace; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartFurnaceController extends MobEntityController { + public MinecartFurnaceController() { + super(EntityMinecartFurnaceNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartFurnaceNPC extends EntityMinecartFurnace implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartFurnaceNPC(World world) { + this(world, null); + } + + public EntityMinecartFurnaceNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new MinecartFurnaceNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class MinecartFurnaceNPC extends CraftMinecartFurnace implements NPCHolder { + private final CitizensNPC npc; + + public MinecartFurnaceNPC(EntityMinecartFurnaceNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java new file mode 100644 index 000000000..bf2276c73 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java @@ -0,0 +1,98 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartHopper; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartHopperController extends MobEntityController { + public MinecartHopperController() { + super(EntityMinecartHopperNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartHopperNPC extends EntityMinecartHopper implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartHopperNPC(World world) { + this(world, null); + } + + public EntityMinecartHopperNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java new file mode 100644 index 000000000..10d257603 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java @@ -0,0 +1,124 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartRideable; +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartRideable; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartRideableController extends MobEntityController { + public MinecartRideableController() { + super(EntityMinecartRideableNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartRideableNPC extends EntityMinecartRideable implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartRideableNPC(World world) { + this(world, null); + } + + public EntityMinecartRideableNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new MinecartRideableNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class MinecartRideableNPC extends CraftMinecartRideable implements NPCHolder { + private final CitizensNPC npc; + + public MinecartRideableNPC(EntityMinecartRideableNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java new file mode 100644 index 000000000..308d192c1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java @@ -0,0 +1,99 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartMobSpawner; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartSpawnerController extends MobEntityController { + public MinecartSpawnerController() { + super(EntityMinecartSpawnerNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartSpawnerNPC extends EntityMinecartMobSpawner implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartSpawnerNPC(World world) { + this(world, null); + } + + public EntityMinecartSpawnerNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public NPC getNPC() { + return npc; + } + + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java new file mode 100644 index 000000000..157772372 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java @@ -0,0 +1,98 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.entity.Minecart; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.EntityMinecartTNT; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class MinecartTNTController extends MobEntityController { + public MinecartTNTController() { + super(EntityMinecartTNTNPC.class); + } + + @Override + public Minecart getBukkitEntity() { + return (Minecart) super.getBukkitEntity(); + } + + public static class EntityMinecartTNTNPC extends EntityMinecartTNT implements NPCHolder { + private final CitizensNPC npc; + + public EntityMinecartTNTNPC(World world) { + this(world, null); + } + + public EntityMinecartTNTNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void tick() { + super.tick(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + + @Override + public void collide(net.minecraft.server.v1_13_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 boolean damageEntity(DamageSource damagesource, float f) { + if (npc == null || !npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + return super.damageEntity(damagesource, f); + return false; + } + + @Override + public void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java new file mode 100644 index 000000000..4a4e83d82 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java @@ -0,0 +1,120 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityPainting; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPainting; +import org.bukkit.entity.Painting; +import org.bukkit.util.Vector; + +public class PaintingController extends MobEntityController { + public PaintingController() { + super(EntityPaintingNPC.class); + } + + @Override + public Painting getBukkitEntity() { + return (Painting) super.getBukkitEntity(); + } + + public static class EntityPaintingNPC extends EntityPainting implements NPCHolder { + private final CitizensNPC npc; + + public EntityPaintingNPC(World world) { + this(world, null); + } + + public EntityPaintingNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new PaintingNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + + @Override + public boolean survives() { + return npc == null || !npc.isProtected() ? super.survives() : true; + } + } + + public static class PaintingNPC extends CraftPainting implements NPCHolder { + private final CitizensNPC npc; + + public PaintingNPC(EntityPaintingNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java new file mode 100644 index 000000000..46a1c0fba --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftShulkerBullet; +import org.bukkit.entity.ShulkerBullet; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityShulkerBullet; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class ShulkerBulletController extends MobEntityController { + public ShulkerBulletController() { + super(EntityShulkerBulletNPC.class); + } + + @Override + public ShulkerBullet getBukkitEntity() { + return (ShulkerBullet) super.getBukkitEntity(); + } + + public static class EntityShulkerBulletNPC extends EntityShulkerBullet implements NPCHolder { + private final CitizensNPC npc; + + public EntityShulkerBulletNPC(World world) { + this(world, null); + } + + public EntityShulkerBulletNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ShulkerBulletNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class ShulkerBulletNPC extends CraftShulkerBullet implements NPCHolder { + private final CitizensNPC npc; + + public ShulkerBulletNPC(EntityShulkerBulletNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java new file mode 100644 index 000000000..aa7971c27 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java @@ -0,0 +1,118 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSmallFireball; +import org.bukkit.entity.SmallFireball; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntitySmallFireball; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class SmallFireballController extends MobEntityController { + public SmallFireballController() { + super(EntitySmallFireballNPC.class); + } + + @Override + public SmallFireball getBukkitEntity() { + return (SmallFireball) super.getBukkitEntity(); + } + + public static class EntitySmallFireballNPC extends EntitySmallFireball implements NPCHolder { + private final CitizensNPC npc; + + public EntitySmallFireballNPC(World world) { + this(world, null); + } + + public EntitySmallFireballNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new SmallFireballNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + } + + public static class SmallFireballNPC extends CraftSmallFireball implements NPCHolder { + private final CitizensNPC npc; + + public SmallFireballNPC(EntitySmallFireballNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java new file mode 100644 index 000000000..419af17d3 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntitySnowball; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSnowball; +import org.bukkit.entity.Snowball; +import org.bukkit.util.Vector; + +public class SnowballController extends MobEntityController { + public SnowballController() { + super(EntitySnowballNPC.class); + } + + @Override + public Snowball getBukkitEntity() { + return (Snowball) super.getBukkitEntity(); + } + + public static class SnowballNPC extends CraftSnowball implements NPCHolder { + private final CitizensNPC npc; + + public SnowballNPC(EntitySnowballNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class EntitySnowballNPC extends EntitySnowball implements NPCHolder { + private final CitizensNPC npc; + + public EntitySnowballNPC(World world) { + this(world, null); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + public EntitySnowballNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new SnowballNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java new file mode 100644 index 000000000..4a346bebf --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Arrow; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntitySpectralArrow; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class SpectralArrowController extends MobEntityController { + public SpectralArrowController() { + super(EntitySpectralArrowNPC.class); + } + + @Override + public Arrow getBukkitEntity() { + return (Arrow) super.getBukkitEntity(); + } + + public static class EntitySpectralArrowNPC extends EntitySpectralArrow implements NPCHolder { + private final CitizensNPC npc; + + public EntitySpectralArrowNPC(World world) { + this(world, null); + } + + public EntitySpectralArrowNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new SpectralArrowNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class SpectralArrowNPC extends CraftArrow implements NPCHolder { + private final CitizensNPC npc; + + public SpectralArrowNPC(EntitySpectralArrowNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java new file mode 100644 index 000000000..435c4bb61 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityTNTPrimed; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTNTPrimed; +import org.bukkit.entity.TNTPrimed; +import org.bukkit.util.Vector; + +public class TNTPrimedController extends MobEntityController { + public TNTPrimedController() { + super(EntityTNTPrimedNPC.class); + } + + @Override + public TNTPrimed getBukkitEntity() { + return (TNTPrimed) super.getBukkitEntity(); + } + + public static class EntityTNTPrimedNPC extends EntityTNTPrimed implements NPCHolder { + private final CitizensNPC npc; + + public EntityTNTPrimedNPC(World world) { + this(world, null); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + public EntityTNTPrimedNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new TNTPrimedNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class TNTPrimedNPC extends CraftTNTPrimed implements NPCHolder { + private final CitizensNPC npc; + + public TNTPrimedNPC(EntityTNTPrimedNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java new file mode 100644 index 000000000..d2eec8783 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java @@ -0,0 +1,118 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftThrownExpBottle; +import org.bukkit.entity.ThrownExpBottle; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityThrownExpBottle; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class ThrownExpBottleController extends MobEntityController { + public ThrownExpBottleController() { + super(EntityThrownExpBottleNPC.class); + } + + @Override + public ThrownExpBottle getBukkitEntity() { + return (ThrownExpBottle) super.getBukkitEntity(); + } + + public static class EntityThrownExpBottleNPC extends EntityThrownExpBottle implements NPCHolder { + private final CitizensNPC npc; + + public EntityThrownExpBottleNPC(World world) { + this(world, null); + } + + public EntityThrownExpBottleNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ThrownExpBottleNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { + super.tick(); + } + } else { + super.tick(); + } + } + } + + public static class ThrownExpBottleNPC extends CraftThrownExpBottle implements NPCHolder { + private final CitizensNPC npc; + + public ThrownExpBottleNPC(EntityThrownExpBottleNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java new file mode 100644 index 000000000..f88a77958 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java @@ -0,0 +1,134 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLingeringPotion; +import org.bukkit.entity.ThrownPotion; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityPotion; +import net.minecraft.server.v1_13_R1.Items; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class ThrownPotionController extends MobEntityController { + public ThrownPotionController() { + super(EntityThrownPotionNPC.class); + } + + @Override + public ThrownPotion getBukkitEntity() { + return (ThrownPotion) super.getBukkitEntity(); + } + + public static class EntityThrownPotionNPC extends EntityPotion implements NPCHolder { + private final CitizensNPC npc; + + public EntityThrownPotionNPC(World world) { + this(world, null); + } + + public EntityThrownPotionNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + if (getItem() != null && getItem().getItem().equals(Items.LINGERING_POTION)) { + bukkitEntity = new LingeringThrownPotionNPC(this); + } else { + bukkitEntity = new SplashThrownPotionNPC(this); + } + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class LingeringThrownPotionNPC extends CraftLingeringPotion implements NPCHolder { + private final CitizensNPC npc; + + public LingeringThrownPotionNPC(EntityThrownPotionNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } + + public static class SplashThrownPotionNPC extends CraftLingeringPotion implements NPCHolder { + private final CitizensNPC npc; + + public SplashThrownPotionNPC(EntityThrownPotionNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java new file mode 100644 index 000000000..52c7f0a24 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTrident; +import org.bukkit.entity.Trident; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityThrownTrident; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class ThrownTridentController extends MobEntityController { + public ThrownTridentController() { + super(EntityThrownTridentNPC.class); + } + + @Override + public Trident getBukkitEntity() { + return (Trident) super.getBukkitEntity(); + } + + public static class EntityThrownTridentNPC extends EntityThrownTrident implements NPCHolder { + private final CitizensNPC npc; + + public EntityThrownTridentNPC(World world) { + this(world, null); + } + + public EntityThrownTridentNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new ThrownTridentNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class ThrownTridentNPC extends CraftTrident implements NPCHolder { + private final CitizensNPC npc; + + public ThrownTridentNPC(EntityThrownTridentNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java new file mode 100644 index 000000000..386948e69 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.entity.Arrow; +import org.bukkit.util.Vector; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityTippedArrow; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +public class TippedArrowController extends MobEntityController { + public TippedArrowController() { + super(EntityTippedArrowNPC.class); + } + + @Override + public Arrow getBukkitEntity() { + return (Arrow) super.getBukkitEntity(); + } + + public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder { + private final CitizensNPC npc; + + public EntityTippedArrowNPC(World world) { + this(world, null); + } + + public EntityTippedArrowNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new TippedArrowNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class TippedArrowNPC extends CraftArrow implements NPCHolder { + private final CitizensNPC npc; + + public TippedArrowNPC(EntityTippedArrowNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java new file mode 100644 index 000000000..851389ac8 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java @@ -0,0 +1,115 @@ +package net.citizensnpcs.nms.v1_13_R1.entity.nonliving; + +import net.citizensnpcs.api.event.NPCPushEvent; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController; +import net.citizensnpcs.npc.CitizensNPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.EntityWitherSkull; +import net.minecraft.server.v1_13_R1.NBTTagCompound; +import net.minecraft.server.v1_13_R1.World; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWitherSkull; +import org.bukkit.entity.WitherSkull; +import org.bukkit.util.Vector; + +public class WitherSkullController extends MobEntityController { + public WitherSkullController() { + super(EntityWitherSkullNPC.class); + } + + @Override + public WitherSkull getBukkitEntity() { + return (WitherSkull) super.getBukkitEntity(); + } + + public static class EntityWitherSkullNPC extends EntityWitherSkull implements NPCHolder { + private final CitizensNPC npc; + + public EntityWitherSkullNPC(World world) { + this(world, null); + } + + @Override + public boolean d(NBTTagCompound save) { + return npc == null ? super.d(save) : false; + } + + public EntityWitherSkullNPC(World world, NPC npc) { + super(world); + this.npc = (CitizensNPC) npc; + } + + @Override + public void collide(net.minecraft.server.v1_13_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 void f(double x, double y, double z) { + if (npc == null) { + super.f(x, y, z); + return; + } + if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { + if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) + super.f(x, y, z); + return; + } + Vector vector = new Vector(x, y, z); + NPCPushEvent event = Util.callPushEvent(npc, vector); + if (!event.isCancelled()) { + vector = event.getCollisionVector(); + super.f(vector.getX(), vector.getY(), vector.getZ()); + } + // when another entity collides, this method is called to push the + // NPC so we prevent it from doing anything if the event is + // cancelled. + } + + @Override + public CraftEntity getBukkitEntity() { + if (npc != null && !(bukkitEntity instanceof NPCHolder)) { + bukkitEntity = new WitherSkullNPC(this); + } + return super.getBukkitEntity(); + } + + @Override + public NPC getNPC() { + return npc; + } + + @Override + public void tick() { + if (npc != null) { + npc.update(); + } else { + super.tick(); + } + } + } + + public static class WitherSkullNPC extends CraftWitherSkull implements NPCHolder { + private final CitizensNPC npc; + + public WitherSkullNPC(EntityWitherSkullNPC entity) { + super((CraftServer) Bukkit.getServer(), entity); + this.npc = entity.npc; + } + + @Override + public NPC getNPC() { + return npc; + } + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java new file mode 100644 index 000000000..b72b751bb --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java @@ -0,0 +1,80 @@ +package net.citizensnpcs.nms.v1_13_R1.network; + +import java.net.SocketAddress; + +import io.netty.channel.AbstractChannel; +import io.netty.channel.Channel; +import io.netty.channel.ChannelConfig; +import io.netty.channel.ChannelMetadata; +import io.netty.channel.ChannelOutboundBuffer; +import io.netty.channel.DefaultChannelConfig; +import io.netty.channel.EventLoop; + +public class EmptyChannel extends AbstractChannel { + private final ChannelConfig config = new DefaultChannelConfig(this); + + public EmptyChannel(Channel parent) { + super(parent); + } + + @Override + public ChannelConfig config() { + config.setAutoRead(true); + return config; + } + + @Override + protected void doBeginRead() throws Exception { + } + + @Override + protected void doBind(SocketAddress arg0) throws Exception { + } + + @Override + protected void doClose() throws Exception { + } + + @Override + protected void doDisconnect() throws Exception { + } + + @Override + protected void doWrite(ChannelOutboundBuffer arg0) throws Exception { + } + + @Override + public boolean isActive() { + return false; + } + + @Override + protected boolean isCompatible(EventLoop arg0) { + return true; + } + + @Override + public boolean isOpen() { + return false; + } + + @Override + protected SocketAddress localAddress0() { + return null; + } + + @Override + public ChannelMetadata metadata() { + return new ChannelMetadata(true); + } + + @Override + protected AbstractUnsafe newUnsafe() { + return null; + } + + @Override + protected SocketAddress remoteAddress0() { + return null; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java new file mode 100644 index 000000000..3e9c8a7f2 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java @@ -0,0 +1,17 @@ +package net.citizensnpcs.nms.v1_13_R1.network; + +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.MinecraftServer; +import net.minecraft.server.v1_13_R1.NetworkManager; +import net.minecraft.server.v1_13_R1.Packet; +import net.minecraft.server.v1_13_R1.PlayerConnection; + +public class EmptyNetHandler extends PlayerConnection { + public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) { + super(minecraftServer, networkManager, entityPlayer); + } + + @Override + public void sendPacket(Packet packet) { + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java new file mode 100644 index 000000000..ee64e2336 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java @@ -0,0 +1,19 @@ +package net.citizensnpcs.nms.v1_13_R1.network; + +import java.io.IOException; + +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.minecraft.server.v1_13_R1.EnumProtocolDirection; +import net.minecraft.server.v1_13_R1.NetworkManager; + +public class EmptyNetworkManager extends NetworkManager { + public EmptyNetworkManager(EnumProtocolDirection flag) throws IOException { + super(flag); + NMSImpl.initNetworkManager(this); + } + + @Override + public boolean isConnected() { + return true; + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java new file mode 100644 index 000000000..f4456e1b5 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java @@ -0,0 +1,21 @@ +package net.citizensnpcs.nms.v1_13_R1.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; + +public class EmptySocket extends Socket { + @Override + public InputStream getInputStream() { + return new ByteArrayInputStream(EMPTY); + } + + @Override + public OutputStream getOutputStream() { + return new ByteArrayOutputStream(10); + } + + private static final byte[] EMPTY = new byte[50]; +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java new file mode 100644 index 000000000..81b2030ce --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java @@ -0,0 +1,74 @@ +package net.citizensnpcs.nms.v1_13_R1.trait; + +import java.util.Collection; +import java.util.List; + +import org.bukkit.boss.BarColor; +import org.bukkit.boss.BarFlag; +import org.bukkit.boss.BossBar; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; + +import com.google.common.collect.Lists; + +import net.citizensnpcs.api.persistence.Persist; +import net.citizensnpcs.api.trait.Trait; +import net.citizensnpcs.api.trait.TraitName; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; + +@TraitName("bossbar") +public class BossBarTrait extends Trait { + @Persist("color") + private BarColor color = null; + @Persist("flags") + private List flags = Lists.newArrayList(); + @Persist("title") + private String title = null; + @Persist("visible") + private boolean visible = true; + + public BossBarTrait() { + super("bossbar"); + } + + private boolean isBoss(Entity entity) { + return entity.getType() == EntityType.ENDER_DRAGON || entity.getType() == EntityType.WITHER + || entity.getType() == EntityType.GUARDIAN; + } + + @Override + public void run() { + if (!npc.isSpawned() || !isBoss(npc.getEntity())) + return; + BossBar bar = NMSImpl.getBossBar(npc.getEntity()); + bar.setVisible(visible); + if (color != null) { + bar.setColor(color); + } + if (title != null) { + bar.setTitle(title); + } + for (BarFlag flag : BarFlag.values()) { + bar.removeFlag(flag); + } + for (BarFlag flag : flags) { + bar.addFlag(flag); + } + } + + public void setColor(BarColor color) { + this.color = color; + } + + public void setFlags(Collection flags) { + this.flags = Lists.newArrayList(flags); + } + + public void setTitle(String title) { + this.title = title; + } + + public void setVisible(boolean visible) { + this.visible = visible; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java new file mode 100644 index 000000000..583f0b50f --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java @@ -0,0 +1,149 @@ +package net.citizensnpcs.nms.v1_13_R1.trait; + +import java.util.List; + +import org.bukkit.DyeColor; +import org.bukkit.boss.BarColor; +import org.bukkit.boss.BarFlag; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Llama.Color; +import org.bukkit.entity.Parrot.Variant; + +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; + +import net.citizensnpcs.api.command.Command; +import net.citizensnpcs.api.command.CommandContext; +import net.citizensnpcs.api.command.Requirements; +import net.citizensnpcs.api.command.exception.CommandException; +import net.citizensnpcs.api.command.exception.CommandUsageException; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.util.Messages; +import net.citizensnpcs.util.Util; + +public class Commands { + @Command( + aliases = { "npc" }, + usage = "bossbar --color [color] --title [title] --visible [visible] --flags [flags]", + desc = "Edit bossbar properties", + modifiers = { "bossbar" }, + min = 1, + max = 1) + @Requirements(selected = true, ownership = true, types = { EntityType.WITHER, EntityType.ENDER_DRAGON }) + public void bossbar(CommandContext args, CommandSender sender, NPC npc) throws CommandException { + BossBarTrait trait = npc.getTrait(BossBarTrait.class); + if (args.hasValueFlag("color")) { + BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color")); + trait.setColor(color); + } + if (args.hasValueFlag("title")) { + trait.setTitle(args.getFlag("title")); + } + if (args.hasValueFlag("visible")) { + trait.setVisible(Boolean.parseBoolean(args.getFlag("visible"))); + } + if (args.hasValueFlag("flags")) { + List flags = Lists.newArrayList(); + for (String s : Splitter.on(',').omitEmptyStrings().trimResults().split(args.getFlag("flags"))) { + BarFlag flag = Util.matchEnum(BarFlag.values(), s); + if (flag != null) { + flags.add(flag); + } + } + trait.setFlags(flags); + } + } + + @Command( + aliases = { "npc" }, + usage = "llama (--color color) (--strength strength)", + desc = "Sets llama modifiers", + modifiers = { "llama" }, + min = 1, + max = 1, + permission = "citizens.npc.llama") + @Requirements(selected = true, ownership = true, types = EntityType.LLAMA) + public void llama(CommandContext args, CommandSender sender, NPC npc) throws CommandException { + LlamaTrait trait = npc.getTrait(LlamaTrait.class); + String output = ""; + if (args.hasValueFlag("color") || args.hasValueFlag("colour")) { + String colorRaw = args.getFlag("color", args.getFlag("colour")); + Color color = Util.matchEnum(Color.values(), colorRaw); + if (color == null) { + String valid = Util.listValuesPretty(Color.values()); + throw new CommandException(Messages.INVALID_LLAMA_COLOR, valid); + } + trait.setColor(color); + output += Messaging.tr(Messages.LLAMA_COLOR_SET, Util.prettyEnum(color)); + } + if (args.hasValueFlag("strength")) { + trait.setStrength(Math.max(1, Math.min(5, args.getFlagInteger("strength")))); + output += Messaging.tr(Messages.LLAMA_STRENGTH_SET, args.getFlagInteger("strength")); + } + if (!output.isEmpty()) { + Messaging.send(sender, output); + } + } + + @Command( + aliases = { "npc" }, + usage = "parrot (--variant variant)", + desc = "Sets parrot modifiers", + modifiers = { "parrot" }, + min = 1, + max = 1, + permission = "citizens.npc.parrot") + @Requirements(selected = true, ownership = true, types = EntityType.PARROT) + public void parrot(CommandContext args, CommandSender sender, NPC npc) throws CommandException { + ParrotTrait trait = npc.getTrait(ParrotTrait.class); + String output = ""; + if (args.hasValueFlag("variant")) { + String variantRaw = args.getFlag("variant"); + Variant variant = Util.matchEnum(Variant.values(), variantRaw); + if (variant == null) { + String valid = Util.listValuesPretty(Variant.values()); + throw new CommandException(Messages.INVALID_PARROT_VARIANT, valid); + } + trait.setVariant(variant); + output += Messaging.tr(Messages.PARROT_VARIANT_SET, Util.prettyEnum(variant)); + } + if (!output.isEmpty()) { + Messaging.send(sender, output); + } + } + + @Command( + aliases = { "npc" }, + usage = "shulker (--peek [peek] --color [color])", + desc = "Sets shulker modifiers.", + modifiers = { "shulker" }, + min = 1, + max = 1, + permission = "citizens.npc.shulker") + @Requirements(selected = true, ownership = true, types = { EntityType.SHULKER }) + public void shulker(CommandContext args, CommandSender sender, NPC npc) throws CommandException { + ShulkerTrait trait = npc.getTrait(ShulkerTrait.class); + boolean hasArg = false; + if (args.hasValueFlag("peek")) { + int peek = (byte) args.getFlagInteger("peek"); + trait.setPeek(peek); + Messaging.sendTr(sender, Messages.SHULKER_PEEK_SET, npc.getName(), peek); + hasArg = true; + } + if (args.hasValueFlag("color")) { + DyeColor color = Util.matchEnum(DyeColor.values(), args.getFlag("color")); + if (color == null) { + Messaging.sendErrorTr(sender, Messages.INVALID_SHULKER_COLOR, Util.listValuesPretty(DyeColor.values())); + return; + } + trait.setColor(color); + Messaging.sendTr(sender, Messages.SHULKER_COLOR_SET, npc.getName(), Util.prettyEnum(color)); + hasArg = true; + } + if (!hasArg) { + throw new CommandUsageException(); + } + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java new file mode 100644 index 000000000..8d7df3326 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java @@ -0,0 +1,37 @@ +package net.citizensnpcs.nms.v1_13_R1.trait; + +import org.bukkit.entity.Llama; +import org.bukkit.entity.Llama.Color; + +import net.citizensnpcs.api.persistence.Persist; +import net.citizensnpcs.api.trait.Trait; +import net.citizensnpcs.api.trait.TraitName; + +@TraitName("llamatrait") +public class LlamaTrait extends Trait { + @Persist + private Color color = Color.BROWN; + @Persist + private int strength = 3; + + public LlamaTrait() { + super("llamatrait"); + } + + @Override + public void run() { + if (npc.isSpawned() && npc.getEntity() instanceof Llama) { + Llama llama = (Llama) npc.getEntity(); + llama.setColor(color); + llama.setStrength(strength); + } + } + + public void setColor(Llama.Color color) { + this.color = color; + } + + public void setStrength(int strength) { + this.strength = strength; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java new file mode 100644 index 000000000..d2509add1 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java @@ -0,0 +1,30 @@ +package net.citizensnpcs.nms.v1_13_R1.trait; + +import org.bukkit.entity.Parrot; +import org.bukkit.entity.Parrot.Variant; + +import net.citizensnpcs.api.persistence.Persist; +import net.citizensnpcs.api.trait.Trait; +import net.citizensnpcs.api.trait.TraitName; + +@TraitName("parrottrait") +public class ParrotTrait extends Trait { + @Persist + private Variant variant = Variant.BLUE; + + public ParrotTrait() { + super("parrottrait"); + } + + @Override + public void run() { + if (npc.isSpawned() && npc.getEntity() instanceof Parrot) { + Parrot parrot = (Parrot) npc.getEntity(); + parrot.setVariant(variant); + } + } + + public void setVariant(Parrot.Variant variant) { + this.variant = variant; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java new file mode 100644 index 000000000..81d635929 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java @@ -0,0 +1,51 @@ +package net.citizensnpcs.nms.v1_13_R1.trait; + +import org.bukkit.DyeColor; +import org.bukkit.entity.Shulker; + +import net.citizensnpcs.api.persistence.Persist; +import net.citizensnpcs.api.trait.Trait; +import net.citizensnpcs.api.trait.TraitName; +import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl; +import net.citizensnpcs.util.NMS; + +@TraitName("shulkertrait") +public class ShulkerTrait extends Trait { + @Persist("color") + private DyeColor color = DyeColor.PURPLE; + private int lastPeekSet = 0; + @Persist("peek") + private int peek = 0; + + public ShulkerTrait() { + super("shulkertrait"); + } + + @Override + public void onSpawn() { + setPeek(peek); + } + + @Override + public void run() { + if (color == null) { + color = DyeColor.PURPLE; + } + if (npc.getEntity() instanceof Shulker) { + if (peek != lastPeekSet) { + NMS.setPeekShulker((Shulker) npc.getEntity(), peek); + lastPeekSet = peek; + } + NMSImpl.setShulkerColor((Shulker) npc.getEntity(), color); + } + } + + public void setColor(DyeColor color) { + this.color = color; + } + + public void setPeek(int peek) { + this.peek = peek; + lastPeekSet = -1; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java new file mode 100644 index 000000000..e99976b0e --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java @@ -0,0 +1,175 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftItemStack; +import org.bukkit.entity.Player; + +import net.citizensnpcs.api.ai.tree.BehaviorStatus; +import net.citizensnpcs.api.npc.BlockBreaker; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.PlayerAnimation; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.Blocks; +import net.minecraft.server.v1_13_R1.EnchantmentManager; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityLiving; +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.EnumItemSlot; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.ItemStack; +import net.minecraft.server.v1_13_R1.MobEffects; +import net.minecraft.server.v1_13_R1.TagsFluid; + +public class CitizensBlockBreaker extends BlockBreaker { + private final BlockBreakerConfiguration configuration; + private int currentDamage; + private int currentTick; + private final Entity entity; + private boolean isDigging = true; + private final Location location; + private int startDigTick; + private final int x, y, z; + + public CitizensBlockBreaker(org.bukkit.entity.Entity entity, org.bukkit.block.Block target, + BlockBreakerConfiguration config) { + this.entity = ((CraftEntity) entity).getHandle(); + this.x = target.getX(); + this.y = target.getY(); + this.z = target.getZ(); + this.location = target.getLocation(); + this.startDigTick = (int) (System.currentTimeMillis() / 50); + this.configuration = config; + } + + private double distanceSquared() { + return Math.pow(entity.locX - x, 2) + Math.pow(entity.locY - y, 2) + Math.pow(entity.locZ - z, 2); + } + + private net.minecraft.server.v1_13_R1.ItemStack getCurrentItem() { + return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item()) + : entity instanceof EntityLiving ? ((EntityLiving) entity).getEquipment(EnumItemSlot.MAINHAND) : null; + } + + private float getStrength(IBlockData block) { + float base = block.getBlock().a(block, null, new BlockPosition(0, 0, 0)); + return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F); + } + + private boolean isDestroyable(IBlockData block) { + if (block.getMaterial().isAlwaysDestroyable()) { + return true; + } else { + ItemStack current = getCurrentItem(); + return current != null ? current.b(block) : false; + } + } + + @Override + public void reset() { + if (configuration.callback() != null) { + configuration.callback().run(); + } + isDigging = false; + setBlockDamage(currentDamage = -1); + } + + @Override + public BehaviorStatus run() { + if (entity.dead) { + return BehaviorStatus.FAILURE; + } + if (!isDigging) { + return BehaviorStatus.SUCCESS; + } + currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit + if (configuration.radiusSquared() > 0 && distanceSquared() >= configuration.radiusSquared()) { + startDigTick = currentTick; + if (entity instanceof NPCHolder) { + NPC npc = ((NPCHolder) entity).getNPC(); + if (npc != null && !npc.getNavigator().isNavigating()) { + npc.getNavigator() + .setTarget(entity.world.getWorld().getBlockAt(x, y, z).getLocation().add(0, 1, 0)); + } + } + return BehaviorStatus.RUNNING; + } + Util.faceLocation(entity.getBukkitEntity(), location); + if (entity instanceof EntityPlayer) { + PlayerAnimation.ARM_SWING.play((Player) entity.getBukkitEntity()); + } + IBlockData block = entity.world.getType(new BlockPosition(x, y, z)); + if (block == null || block == Blocks.AIR) { + return BehaviorStatus.SUCCESS; + } else { + int tickDifference = currentTick - startDigTick; + float damage = getStrength(block) * (tickDifference + 1) * configuration.blockStrengthModifier(); + if (damage >= 1F) { + entity.world.getWorld().getBlockAt(x, y, z) + .breakNaturally(CraftItemStack.asCraftMirror(getCurrentItem())); + return BehaviorStatus.SUCCESS; + } + int modifiedDamage = (int) (damage * 10.0F); + if (modifiedDamage != currentDamage) { + setBlockDamage(modifiedDamage); + currentDamage = modifiedDamage; + } + } + return BehaviorStatus.RUNNING; + } + + private void setBlockDamage(int modifiedDamage) { + entity.world.c(entity.getId(), new BlockPosition(x, y, z), modifiedDamage); + } + + @Override + public boolean shouldExecute() { + return entity.world.getType(new BlockPosition(x, y, z)).getBlock() != Blocks.AIR; + } + + private float strengthMod(IBlockData block) { + ItemStack itemstack = getCurrentItem(); + float f = itemstack.a(block); + if (entity instanceof EntityLiving) { + EntityLiving handle = (EntityLiving) entity; + if (f > 1.0F) { + int i = EnchantmentManager.getDigSpeedEnchantmentLevel(handle); + if (i > 0) { + f += i * i + 1; + } + } + if (handle.hasEffect(MobEffects.FASTER_DIG)) { + f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F); + } + if (handle.hasEffect(MobEffects.SLOWER_DIG)) { + float f1 = 1.0F; + switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) { + case 0: + f1 = 0.3F; + break; + case 1: + f1 = 0.09F; + break; + case 2: + f1 = 0.0027F; + break; + case 3: + default: + f1 = 8.1E-4F; + } + f *= f1; + } + + if (handle.a(TagsFluid.a) && !EnchantmentManager.h(handle)) { + f /= 5.0F; + } + + } + if (!entity.onGround) { + f /= 5.0F; + } + return f; + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java new file mode 100644 index 000000000..f91102e11 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java @@ -0,0 +1,101 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.util.Iterator; +import java.util.Map; +import java.util.Random; +import java.util.Set; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import com.google.common.collect.Maps; + +import net.minecraft.server.v1_13_R1.EntityTypes; +import net.minecraft.server.v1_13_R1.MinecraftKey; +import net.minecraft.server.v1_13_R1.RegistryMaterials; + +@SuppressWarnings("rawtypes") +public class CustomEntityRegistry extends RegistryMaterials { + private final BiMap entities = HashBiMap.create(); + private final BiMap entityClasses = this.entities.inverse(); + private final Map entityIds = Maps.newHashMap(); + private final RegistryMaterials> wrapped; + + public CustomEntityRegistry(RegistryMaterials> original) { + this.wrapped = original; + } + + @Override + public void a(int code, Object key, Object v) { + put(code, (MinecraftKey) key, (EntityTypes) v); + } + + @Override + public int a(Object key) { + if (entityIds.containsKey(key)) { + return entityIds.get(key); + } + + return wrapped.a((EntityTypes) key); + } + + @Override + public Object a(Random paramRandom) { + return wrapped.a(paramRandom); + } + + @Override + public MinecraftKey b(Object value) { + if (entityClasses.containsKey(value)) { + return entityClasses.get(value); + } + + return wrapped.b((EntityTypes) value); + } + + @Override + public boolean d(Object paramK) { + return wrapped.d((MinecraftKey) paramK); + } + + public EntityTypes findType(Class search) { + for (Object type : wrapped) { + if (((EntityTypes) type).c() == search) { + return (EntityTypes) type; + } + } + return null; + } + + @Override + public EntityTypes get(Object key) { + if (entities.containsKey(key)) { + return entities.get(key); + } + + return wrapped.get((MinecraftKey) key); + } + + @Override + public Object getId(int paramInt) { + return wrapped.getId(paramInt); + } + + public RegistryMaterials> getWrapped() { + return wrapped; + } + + @Override + public Iterator iterator() { + return (Iterator) wrapped.iterator(); + } + + @Override + public Set keySet() { + return (Set) wrapped.keySet(); + } + + public void put(int entityId, MinecraftKey key, EntityTypes entityClass) { + entities.put(key, entityClass); + entityIds.put(entityClass, entityId); + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java new file mode 100644 index 000000000..e75d1211c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java @@ -0,0 +1,57 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; + +import net.citizensnpcs.api.CitizensAPI; +import net.minecraft.server.v1_13_R1.Advancement; +import net.minecraft.server.v1_13_R1.AdvancementDataPlayer; +import net.minecraft.server.v1_13_R1.AdvancementProgress; +import net.minecraft.server.v1_13_R1.EntityPlayer; + +public class DummyPlayerAdvancementData extends AdvancementDataPlayer { + private DummyPlayerAdvancementData() { + super(((CraftServer) Bukkit.getServer()).getServer(), CitizensAPI.getDataFolder(), null); + } + + @Override + public void a() { + } + + @Override + public void a(Advancement adv) { + } + + @Override + public void a(EntityPlayer p) { + } + + @Override + public void b() { + } + + @Override + public void b(EntityPlayer p) { + } + + @Override + public void c() { + } + + @Override + public AdvancementProgress getProgress(Advancement adv) { + return new AdvancementProgress(); + } + + @Override + public boolean grantCriteria(Advancement adv, String str) { + return false; + } + + @Override + public boolean revokeCritera(Advancement adv, String str) { + return true; + } + + public static final DummyPlayerAdvancementData INSTANCE = new DummyPlayerAdvancementData(); +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java new file mode 100644 index 000000000..5d7342048 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java @@ -0,0 +1,73 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.io.File; +import java.lang.reflect.Field; +import java.util.Set; + +import net.citizensnpcs.util.NMS; +import net.minecraft.server.v1_13_R1.Advancement; +import net.minecraft.server.v1_13_R1.AdvancementDataPlayer; +import net.minecraft.server.v1_13_R1.AdvancementProgress; +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.MinecraftServer; + +public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer { + public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) { + super(minecraftserver, file, entityplayer); + this.b(); + } + + @Override + public void a(Advancement advancement) { + } + + @Override + public void a(EntityPlayer entityplayer) { + } + + @Override + public void b() { + clear(this); + } + + @Override + public void b(EntityPlayer entityplayer) { + } + + @Override + public void c() { + } + + @Override + public AdvancementProgress getProgress(Advancement advancement) { + return new AdvancementProgress(); + } + + @Override + public boolean grantCriteria(Advancement advancement, String s) { + return false; + } + + @Override + public boolean revokeCritera(Advancement advancement, String s) { + return false; + } + + public static void clear(AdvancementDataPlayer data) { + data.a(); + data.data.clear(); + try { + ((Set) G.get(data)).clear(); + ((Set) H.get(data)).clear(); + ((Set) I.get(data)).clear(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + + private static final Field G = NMS.getField(AdvancementDataPlayer.class, "g"); + private static final Field H = NMS.getField(AdvancementDataPlayer.class, "h"); + private static final Field I = NMS.getField(AdvancementDataPlayer.class, "i"); +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java new file mode 100644 index 000000000..3dedd45af --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java @@ -0,0 +1,1607 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.SocketAddress; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; + +import org.bukkit.Bukkit; +import org.bukkit.DyeColor; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.World; +import org.bukkit.boss.BarColor; +import org.bukkit.boss.BarStyle; +import org.bukkit.boss.BossBar; +import org.bukkit.craftbukkit.v1_13_R1.CraftServer; +import org.bukkit.craftbukkit.v1_13_R1.CraftSound; +import org.bukkit.craftbukkit.v1_13_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_13_R1.boss.CraftBossBar; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWither; +import org.bukkit.craftbukkit.v1_13_R1.event.CraftEventFactory; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.FishHook; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Shulker; +import org.bukkit.entity.Tameable; +import org.bukkit.entity.Wither; +import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; +import org.bukkit.inventory.meta.SkullMeta; +import org.bukkit.plugin.PluginLoadOrder; +import org.bukkit.util.Vector; + +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.GameProfileRepository; +import com.mojang.authlib.HttpAuthenticationService; +import com.mojang.authlib.minecraft.MinecraftSessionService; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; +import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse; +import com.mojang.util.UUIDTypeAdapter; + +import net.citizensnpcs.Settings.Setting; +import net.citizensnpcs.api.CitizensAPI; +import net.citizensnpcs.api.ai.NavigatorParameters; +import net.citizensnpcs.api.ai.event.CancelReason; +import net.citizensnpcs.api.command.CommandManager; +import net.citizensnpcs.api.command.exception.CommandException; +import net.citizensnpcs.api.npc.BlockBreaker; +import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPCRegistry; +import net.citizensnpcs.api.trait.TraitInfo; +import net.citizensnpcs.api.util.Messaging; +import net.citizensnpcs.nms.v1_13_R1.entity.BatController; +import net.citizensnpcs.nms.v1_13_R1.entity.BlazeController; +import net.citizensnpcs.nms.v1_13_R1.entity.CaveSpiderController; +import net.citizensnpcs.nms.v1_13_R1.entity.ChickenController; +import net.citizensnpcs.nms.v1_13_R1.entity.CodController; +import net.citizensnpcs.nms.v1_13_R1.entity.CowController; +import net.citizensnpcs.nms.v1_13_R1.entity.CreeperController; +import net.citizensnpcs.nms.v1_13_R1.entity.DolphinController; +import net.citizensnpcs.nms.v1_13_R1.entity.DrownedController; +import net.citizensnpcs.nms.v1_13_R1.entity.EnderDragonController; +import net.citizensnpcs.nms.v1_13_R1.entity.EndermanController; +import net.citizensnpcs.nms.v1_13_R1.entity.EndermiteController; +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_13_R1.entity.EvokerController; +import net.citizensnpcs.nms.v1_13_R1.entity.GhastController; +import net.citizensnpcs.nms.v1_13_R1.entity.GiantController; +import net.citizensnpcs.nms.v1_13_R1.entity.GuardianController; +import net.citizensnpcs.nms.v1_13_R1.entity.GuardianElderController; +import net.citizensnpcs.nms.v1_13_R1.entity.HorseController; +import net.citizensnpcs.nms.v1_13_R1.entity.HorseDonkeyController; +import net.citizensnpcs.nms.v1_13_R1.entity.HorseMuleController; +import net.citizensnpcs.nms.v1_13_R1.entity.HorseSkeletonController; +import net.citizensnpcs.nms.v1_13_R1.entity.HorseZombieController; +import net.citizensnpcs.nms.v1_13_R1.entity.HumanController; +import net.citizensnpcs.nms.v1_13_R1.entity.IllusionerController; +import net.citizensnpcs.nms.v1_13_R1.entity.IronGolemController; +import net.citizensnpcs.nms.v1_13_R1.entity.LlamaController; +import net.citizensnpcs.nms.v1_13_R1.entity.MagmaCubeController; +import net.citizensnpcs.nms.v1_13_R1.entity.MushroomCowController; +import net.citizensnpcs.nms.v1_13_R1.entity.OcelotController; +import net.citizensnpcs.nms.v1_13_R1.entity.ParrotController; +import net.citizensnpcs.nms.v1_13_R1.entity.PhantomController; +import net.citizensnpcs.nms.v1_13_R1.entity.PigController; +import net.citizensnpcs.nms.v1_13_R1.entity.PigZombieController; +import net.citizensnpcs.nms.v1_13_R1.entity.PolarBearController; +import net.citizensnpcs.nms.v1_13_R1.entity.PufferFishController; +import net.citizensnpcs.nms.v1_13_R1.entity.RabbitController; +import net.citizensnpcs.nms.v1_13_R1.entity.SalmonController; +import net.citizensnpcs.nms.v1_13_R1.entity.SheepController; +import net.citizensnpcs.nms.v1_13_R1.entity.ShulkerController; +import net.citizensnpcs.nms.v1_13_R1.entity.SilverfishController; +import net.citizensnpcs.nms.v1_13_R1.entity.SkeletonController; +import net.citizensnpcs.nms.v1_13_R1.entity.SkeletonStrayController; +import net.citizensnpcs.nms.v1_13_R1.entity.SkeletonWitherController; +import net.citizensnpcs.nms.v1_13_R1.entity.SlimeController; +import net.citizensnpcs.nms.v1_13_R1.entity.SnowmanController; +import net.citizensnpcs.nms.v1_13_R1.entity.SpiderController; +import net.citizensnpcs.nms.v1_13_R1.entity.SquidController; +import net.citizensnpcs.nms.v1_13_R1.entity.TropicalFishController; +import net.citizensnpcs.nms.v1_13_R1.entity.TurtleController; +import net.citizensnpcs.nms.v1_13_R1.entity.VexController; +import net.citizensnpcs.nms.v1_13_R1.entity.VillagerController; +import net.citizensnpcs.nms.v1_13_R1.entity.VindicatorController; +import net.citizensnpcs.nms.v1_13_R1.entity.WitchController; +import net.citizensnpcs.nms.v1_13_R1.entity.WitherController; +import net.citizensnpcs.nms.v1_13_R1.entity.WolfController; +import net.citizensnpcs.nms.v1_13_R1.entity.ZombieController; +import net.citizensnpcs.nms.v1_13_R1.entity.ZombieHuskController; +import net.citizensnpcs.nms.v1_13_R1.entity.ZombieVillagerController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.AreaEffectCloudController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ArmorStandController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.BoatController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.DragonFireballController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EggController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EnderCrystalController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EnderPearlController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EnderSignalController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EvokerFangsController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.FallingBlockController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.FireworkController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.FishingHookController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ItemController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ItemFrameController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.LargeFireballController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.LeashController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.LlamaSpitController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartChestController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartCommandController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartFurnaceController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartHopperController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartRideableController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartTNTController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.PaintingController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ShulkerBulletController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.SmallFireballController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.SnowballController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.SpectralArrowController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.TNTPrimedController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ThrownExpBottleController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ThrownPotionController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ThrownTridentController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.TippedArrowController; +import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.WitherSkullController; +import net.citizensnpcs.nms.v1_13_R1.network.EmptyChannel; +import net.citizensnpcs.nms.v1_13_R1.trait.BossBarTrait; +import net.citizensnpcs.nms.v1_13_R1.trait.Commands; +import net.citizensnpcs.nms.v1_13_R1.trait.LlamaTrait; +import net.citizensnpcs.nms.v1_13_R1.trait.ParrotTrait; +import net.citizensnpcs.nms.v1_13_R1.trait.ShulkerTrait; +import net.citizensnpcs.npc.EntityControllers; +import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; +import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.npc.skin.SkinnableEntity; +import net.citizensnpcs.util.BoundingBox; +import net.citizensnpcs.util.Messages; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.NMSBridge; +import net.citizensnpcs.util.PlayerAnimation; +import net.citizensnpcs.util.PlayerUpdateTask; +import net.citizensnpcs.util.Util; +import net.minecraft.server.v1_13_R1.AttributeInstance; +import net.minecraft.server.v1_13_R1.AxisAlignedBB; +import net.minecraft.server.v1_13_R1.Block; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.BossBattleServer; +import net.minecraft.server.v1_13_R1.ControllerJump; +import net.minecraft.server.v1_13_R1.CrashReport; +import net.minecraft.server.v1_13_R1.CrashReportSystemDetails; +import net.minecraft.server.v1_13_R1.DamageSource; +import net.minecraft.server.v1_13_R1.DataWatcherObject; +import net.minecraft.server.v1_13_R1.EnchantmentManager; +import net.minecraft.server.v1_13_R1.Enchantments; +import net.minecraft.server.v1_13_R1.EnderDragonBattle; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityBird; +import net.minecraft.server.v1_13_R1.EntityEnderDragon; +import net.minecraft.server.v1_13_R1.EntityFishingHook; +import net.minecraft.server.v1_13_R1.EntityHorse; +import net.minecraft.server.v1_13_R1.EntityHorseAbstract; +import net.minecraft.server.v1_13_R1.EntityHuman; +import net.minecraft.server.v1_13_R1.EntityInsentient; +import net.minecraft.server.v1_13_R1.EntityLiving; +import net.minecraft.server.v1_13_R1.EntityMinecartAbstract; +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.EntityPolarBear; +import net.minecraft.server.v1_13_R1.EntityRabbit; +import net.minecraft.server.v1_13_R1.EntityShulker; +import net.minecraft.server.v1_13_R1.EntityTameableAnimal; +import net.minecraft.server.v1_13_R1.EntityTracker; +import net.minecraft.server.v1_13_R1.EntityTrackerEntry; +import net.minecraft.server.v1_13_R1.EntityTypes; +import net.minecraft.server.v1_13_R1.EntityWither; +import net.minecraft.server.v1_13_R1.EnumMoveType; +import net.minecraft.server.v1_13_R1.GenericAttributes; +import net.minecraft.server.v1_13_R1.MathHelper; +import net.minecraft.server.v1_13_R1.MinecraftKey; +import net.minecraft.server.v1_13_R1.MobEffects; +import net.minecraft.server.v1_13_R1.NavigationAbstract; +import net.minecraft.server.v1_13_R1.NetworkManager; +import net.minecraft.server.v1_13_R1.Packet; +import net.minecraft.server.v1_13_R1.PacketPlayOutEntityTeleport; +import net.minecraft.server.v1_13_R1.PacketPlayOutPlayerInfo; +import net.minecraft.server.v1_13_R1.PathEntity; +import net.minecraft.server.v1_13_R1.PathPoint; +import net.minecraft.server.v1_13_R1.PathfinderGoalSelector; +import net.minecraft.server.v1_13_R1.RegistryMaterials; +import net.minecraft.server.v1_13_R1.ReportedException; +import net.minecraft.server.v1_13_R1.SoundEffect; +import net.minecraft.server.v1_13_R1.SoundEffects; +import net.minecraft.server.v1_13_R1.Vec3D; +import net.minecraft.server.v1_13_R1.WorldServer; + +@SuppressWarnings("unchecked") +public class NMSImpl implements NMSBridge { + public NMSImpl() { + loadEntityTypes(); + } + + @Override + public boolean addEntityToWorld(org.bukkit.entity.Entity entity, SpawnReason custom) { + return getHandle(entity).world.addEntity(getHandle(entity), custom); + } + + @Override + public void addOrRemoveFromPlayerList(org.bukkit.entity.Entity entity, boolean remove) { + if (entity == null) + return; + EntityHuman handle = (EntityHuman) getHandle(entity); + if (handle.world == null) + return; + if (remove) { + handle.world.players.remove(handle); + } else if (!handle.world.players.contains(handle)) { + handle.world.players.add(handle); + } + PlayerUpdateTask.addOrRemove(entity, remove); + } + + @Override + public void attack(LivingEntity attacker, LivingEntity btarget) { + EntityLiving handle = getHandle(attacker); + EntityLiving target = getHandle(btarget); + if (handle instanceof EntityPlayer) { + EntityPlayer humanHandle = (EntityPlayer) handle; + humanHandle.attack(target); + PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity()); + return; + } + AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE); + float f = (float) (attackDamage == null ? 1 : attackDamage.getValue()); + int i = 0; + + if (target instanceof EntityLiving) { + f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType()); + i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle); + } + + boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f); + + if (!flag) + return; + if (i > 0) { + target.f(-Math.sin(handle.yaw * Math.PI / 180.0F) * i * 0.5F, 0.1D, + Math.cos(handle.yaw * Math.PI / 180.0F) * i * 0.5F); + handle.motX *= 0.6D; + handle.motZ *= 0.6D; + } + + int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle); + + if (fireAspectLevel > 0) { + target.setOnFire(fireAspectLevel * 4); + } + } + + @Override + public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) throws Exception { + if (Bukkit.isPrimaryThread()) + throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread."); + + MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().ar(); + if (!(sessionService instanceof YggdrasilMinecraftSessionService)) { + return sessionService.fillProfileProperties(profile, requireSecure); + } + YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService) + .getAuthenticationService(); + + URL url = HttpAuthenticationService + .constantURL(getAuthServerBaseUrl() + UUIDTypeAdapter.fromUUID(profile.getId())); + + url = HttpAuthenticationService.concatenateURL(url, "unsigned=" + !requireSecure); + + MinecraftProfilePropertiesResponse response = (MinecraftProfilePropertiesResponse) MAKE_REQUEST.invoke(auth, + url, null, MinecraftProfilePropertiesResponse.class); + if (response == null) + return profile; + + GameProfile result = new GameProfile(response.getId(), response.getName()); + result.getProperties().putAll(response.getProperties()); + profile.getProperties().putAll(response.getProperties()); + + return result; + } + + public String getAuthServerBaseUrl() { + return Setting.AUTH_SERVER_URL.asString(); + } + + @Override + public BlockBreaker getBlockBreaker(org.bukkit.entity.Entity entity, org.bukkit.block.Block targetBlock, + BlockBreakerConfiguration config) { + return new CitizensBlockBreaker(entity, targetBlock, config); + } + + @Override + public BoundingBox getBoundingBox(org.bukkit.entity.Entity handle) { + AxisAlignedBB bb = NMSImpl.getHandle(handle).getBoundingBox(); + return new BoundingBox(bb.a, bb.b, bb.c, bb.d, bb.e, bb.f); + } + + private float getDragonYaw(Entity handle, double tX, double tZ) { + if (handle.locZ > tZ) + return (float) (-Math.toDegrees(Math.atan((handle.locX - tX) / (handle.locZ - tZ)))); + if (handle.locZ < tZ) { + return (float) (-Math.toDegrees(Math.atan((handle.locX - tX) / (handle.locZ - tZ)))) + 180.0F; + } + return handle.yaw; + } + + @Override + public GameProfileRepository getGameProfileRepository() { + return ((CraftServer) Bukkit.getServer()).getServer().getGameProfileRepository(); + } + + @Override + public float getHeadYaw(org.bukkit.entity.Entity entity) { + if (!(entity instanceof LivingEntity)) { + return entity.getLocation().getYaw(); + } + return getHandle((LivingEntity) entity).aS; + } + + @Override + public float getHorizontalMovement(org.bukkit.entity.Entity entity) { + if (!entity.getType().isAlive()) + return Float.NaN; + EntityLiving handle = NMSImpl.getHandle((LivingEntity) entity); + return handle.bj; + } + + @Override + public NPC getNPC(org.bukkit.entity.Entity entity) { + return getHandle(entity) instanceof NPCHolder ? ((NPCHolder) getHandle(entity)).getNPC() : null; + } + + @Override + public List getPassengers(org.bukkit.entity.Entity entity) { + return Lists.transform(NMSImpl.getHandle(entity).passengers, new Function() { + @Override + public org.bukkit.entity.Entity apply(Entity input) { + return input.getBukkitEntity(); + } + }); + } + + @Override + public GameProfile getProfile(SkullMeta meta) { + if (SKULL_PROFILE_FIELD == null) { + try { + SKULL_PROFILE_FIELD = meta.getClass().getDeclaredField("profile"); + SKULL_PROFILE_FIELD.setAccessible(true); + } catch (Exception e) { + return null; + } + } + try { + return (GameProfile) SKULL_PROFILE_FIELD.get(meta); + } catch (Exception e) { + return null; + } + } + + @Override + public String getSound(String flag) throws CommandException { + try { + String ret = CraftSound.getSound(Sound.valueOf(flag.toUpperCase())); + if (ret == null) + throw new CommandException(Messages.INVALID_SOUND); + return ret; + } catch (Exception e) { + throw new CommandException(Messages.INVALID_SOUND); + } + } + + @Override + public float getSpeedFor(NPC npc) { + if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity)) + return DEFAULT_SPEED; + EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity()); + if (handle == null) + return DEFAULT_SPEED; + return DEFAULT_SPEED; + // return (float) + // handle.getAttributeInstance(GenericAttributes.d).getValue(); + } + + @Override + public float getStepHeight(org.bukkit.entity.Entity entity) { + return NMSImpl.getHandle(entity).Q; + } + + @Override + public MCNavigator getTargetNavigator(org.bukkit.entity.Entity entity, Iterable dest, + final NavigatorParameters params) { + final PathEntity path = new PathEntity( + Iterables.toArray(Iterables.transform(dest, new Function() { + @Override + public PathPoint apply(Vector input) { + return new PathPoint(input.getBlockX(), input.getBlockY(), input.getBlockZ()); + } + }), PathPoint.class)); + return getTargetNavigator(entity, params, new Function() { + @Override + public Boolean apply(NavigationAbstract input) { + return input.a(path, params.speed()); + } + }); + } + + @Override + public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest, + final NavigatorParameters params) { + return getTargetNavigator(entity, params, new Function() { + @Override + public Boolean apply(NavigationAbstract input) { + return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()); + } + }); + } + + private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params, + final Function function) { + net.minecraft.server.v1_13_R1.Entity raw = getHandle(entity); + raw.onGround = true; + // not sure of a better way around this - if onGround is false, then + // navigation won't execute, and calling entity.move doesn't + // entirely fix the problem. + final NavigationAbstract navigation = NMSImpl.getNavigation(entity); + return new MCNavigator() { + float lastSpeed; + CancelReason reason; + + @Override + public CancelReason getCancelReason() { + return reason; + } + + @Override + public Iterable getPath() { + return new NavigationIterable(navigation); + } + + @Override + public void stop() { + if (navigation.n() != null) { + for (Player player : Bukkit.getOnlinePlayers()) { + for (int i = 0; i < navigation.n().d(); i++) { + PathPoint pp = navigation.n().a(i); + org.bukkit.block.Block block = new Vector(pp.a, pp.b, pp.c).toLocation(player.getWorld()) + .getBlock(); + player.sendBlockChange(block.getLocation(), block.getType(), block.getData()); + } + } + } + stopNavigation(navigation); + } + + @Override + public boolean update() { + if (params.speed() != lastSpeed) { + if (Messaging.isDebugging()) { + Messaging.debug( + "Repathfinding " + ((NPCHolder) entity).getNPC().getId() + " due to speed change"); + } + Entity handle = getHandle(entity); + float oldWidth = handle.width; + if (handle instanceof EntityHorse) { + handle.width = Math.min(0.99f, oldWidth); + } + if (!function.apply(navigation)) { + reason = CancelReason.STUCK; + } + handle.width = oldWidth; // minecraft requires that an entity fit onto both blocks if width >= 1f, + // but we'd prefer to make it just fit on 1 so hack around it a bit. + lastSpeed = params.speed(); + } + if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) { + for (Player player : Bukkit.getOnlinePlayers()) { + for (int i = 0; i < navigation.n().d(); i++) { + PathPoint pp = navigation.n().a(i); + player.sendBlockChange(new Vector(pp.a, pp.b, pp.c).toLocation(player.getWorld()), + Material.SUNFLOWER, (byte) 0); + } + } + } + navigation.a(params.speed()); + return NMSImpl.isNavigationFinished(navigation); + } + }; + } + + @Override + public TargetNavigator getTargetNavigator(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity target, + NavigatorParameters parameters) { + NavigationAbstract navigation = getNavigation(entity); + return navigation == null ? null : new NavigationFieldWrapper(navigation, target, parameters); + } + + @Override + public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) { + Entity handle = NMSImpl.getHandle(entity); + if (handle == null) { + return null; + } + Entity e = handle.getVehicle(); + return (e == handle || e == null) ? null : e.getBukkitEntity(); + } + + @Override + public float getVerticalMovement(org.bukkit.entity.Entity entity) { + if (!entity.getType().isAlive()) + return Float.NaN; + EntityLiving handle = NMSImpl.getHandle((LivingEntity) entity); + return handle.bh; + } + + @Override + public boolean isOnGround(org.bukkit.entity.Entity entity) { + return NMSImpl.getHandle(entity).onGround; + } + + @Override + public void load(CommandManager manager) { + CitizensAPI.getTraitFactory().registerTrait(TraitInfo.create(LlamaTrait.class)); + CitizensAPI.getTraitFactory().registerTrait(TraitInfo.create(ParrotTrait.class)); + CitizensAPI.getTraitFactory().registerTrait(TraitInfo.create(BossBarTrait.class)); + CitizensAPI.getTraitFactory().registerTrait(TraitInfo.create(ShulkerTrait.class)); + manager.register(Commands.class); + } + + private void loadEntityTypes() { + EntityControllers.setEntityControllerForType(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloudController.class); + EntityControllers.setEntityControllerForType(EntityType.ARROW, TippedArrowController.class); + EntityControllers.setEntityControllerForType(EntityType.ARMOR_STAND, ArmorStandController.class); + EntityControllers.setEntityControllerForType(EntityType.BAT, BatController.class); + EntityControllers.setEntityControllerForType(EntityType.BLAZE, BlazeController.class); + EntityControllers.setEntityControllerForType(EntityType.BOAT, BoatController.class); + EntityControllers.setEntityControllerForType(EntityType.CAVE_SPIDER, CaveSpiderController.class); + EntityControllers.setEntityControllerForType(EntityType.CHICKEN, ChickenController.class); + EntityControllers.setEntityControllerForType(EntityType.COD, CodController.class); + EntityControllers.setEntityControllerForType(EntityType.COW, CowController.class); + EntityControllers.setEntityControllerForType(EntityType.CREEPER, CreeperController.class); + EntityControllers.setEntityControllerForType(EntityType.DOLPHIN, DolphinController.class); + EntityControllers.setEntityControllerForType(EntityType.DRAGON_FIREBALL, DragonFireballController.class); + EntityControllers.setEntityControllerForType(EntityType.DROPPED_ITEM, ItemController.class); + EntityControllers.setEntityControllerForType(EntityType.DROWNED, DrownedController.class); + EntityControllers.setEntityControllerForType(EntityType.EGG, EggController.class); + EntityControllers.setEntityControllerForType(EntityType.ELDER_GUARDIAN, GuardianElderController.class); + EntityControllers.setEntityControllerForType(EntityType.ENDER_CRYSTAL, EnderCrystalController.class); + EntityControllers.setEntityControllerForType(EntityType.ENDER_DRAGON, EnderDragonController.class); + EntityControllers.setEntityControllerForType(EntityType.ENDER_PEARL, EnderPearlController.class); + EntityControllers.setEntityControllerForType(EntityType.ENDER_SIGNAL, EnderSignalController.class); + EntityControllers.setEntityControllerForType(EntityType.ENDERMAN, EndermanController.class); + EntityControllers.setEntityControllerForType(EntityType.ENDERMITE, EndermiteController.class); + EntityControllers.setEntityControllerForType(EntityType.EVOKER, EvokerController.class); + EntityControllers.setEntityControllerForType(EntityType.EVOKER_FANGS, EvokerFangsController.class); + EntityControllers.setEntityControllerForType(EntityType.FALLING_BLOCK, FallingBlockController.class); + EntityControllers.setEntityControllerForType(EntityType.FIREWORK, FireworkController.class); + EntityControllers.setEntityControllerForType(EntityType.FIREBALL, LargeFireballController.class); + EntityControllers.setEntityControllerForType(EntityType.FISHING_HOOK, FishingHookController.class); + EntityControllers.setEntityControllerForType(EntityType.GHAST, GhastController.class); + EntityControllers.setEntityControllerForType(EntityType.GIANT, GiantController.class); + EntityControllers.setEntityControllerForType(EntityType.GUARDIAN, GuardianController.class); + EntityControllers.setEntityControllerForType(EntityType.HORSE, HorseController.class); + EntityControllers.setEntityControllerForType(EntityType.DONKEY, HorseDonkeyController.class); + EntityControllers.setEntityControllerForType(EntityType.MULE, HorseMuleController.class); + EntityControllers.setEntityControllerForType(EntityType.SKELETON_HORSE, HorseSkeletonController.class); + EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_HORSE, HorseZombieController.class); + EntityControllers.setEntityControllerForType(EntityType.HUSK, ZombieHuskController.class); + EntityControllers.setEntityControllerForType(EntityType.IRON_GOLEM, IronGolemController.class); + EntityControllers.setEntityControllerForType(EntityType.ILLUSIONER, IllusionerController.class); + EntityControllers.setEntityControllerForType(EntityType.ITEM_FRAME, ItemFrameController.class); + EntityControllers.setEntityControllerForType(EntityType.LEASH_HITCH, LeashController.class); + EntityControllers.setEntityControllerForType(EntityType.LLAMA, LlamaController.class); + EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class); + EntityControllers.setEntityControllerForType(EntityType.LINGERING_POTION, ThrownPotionController.class); + EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class); + EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class); + EntityControllers.setEntityControllerForType(EntityType.MINECART_CHEST, MinecartChestController.class); + EntityControllers.setEntityControllerForType(EntityType.MINECART_COMMAND, MinecartCommandController.class); + EntityControllers.setEntityControllerForType(EntityType.MINECART_FURNACE, MinecartFurnaceController.class); + EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class); + EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class); + EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class); + EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class); + EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class); + EntityControllers.setEntityControllerForType(EntityType.PARROT, ParrotController.class); + EntityControllers.setEntityControllerForType(EntityType.PHANTOM, PhantomController.class); + EntityControllers.setEntityControllerForType(EntityType.PIG, PigController.class); + EntityControllers.setEntityControllerForType(EntityType.PIG_ZOMBIE, PigZombieController.class); + EntityControllers.setEntityControllerForType(EntityType.POLAR_BEAR, PolarBearController.class); + EntityControllers.setEntityControllerForType(EntityType.PLAYER, HumanController.class); + EntityControllers.setEntityControllerForType(EntityType.PUFFERFISH, PufferFishController.class); + EntityControllers.setEntityControllerForType(EntityType.RABBIT, RabbitController.class); + EntityControllers.setEntityControllerForType(EntityType.SALMON, SalmonController.class); + EntityControllers.setEntityControllerForType(EntityType.SHEEP, SheepController.class); + EntityControllers.setEntityControllerForType(EntityType.SHULKER, ShulkerController.class); + EntityControllers.setEntityControllerForType(EntityType.SHULKER_BULLET, ShulkerBulletController.class); + EntityControllers.setEntityControllerForType(EntityType.SILVERFISH, SilverfishController.class); + EntityControllers.setEntityControllerForType(EntityType.SKELETON, SkeletonController.class); + EntityControllers.setEntityControllerForType(EntityType.STRAY, SkeletonStrayController.class); + EntityControllers.setEntityControllerForType(EntityType.SLIME, SlimeController.class); + EntityControllers.setEntityControllerForType(EntityType.SMALL_FIREBALL, SmallFireballController.class); + EntityControllers.setEntityControllerForType(EntityType.SNOWBALL, SnowballController.class); + EntityControllers.setEntityControllerForType(EntityType.SNOWMAN, SnowmanController.class); + EntityControllers.setEntityControllerForType(EntityType.SPECTRAL_ARROW, SpectralArrowController.class); + EntityControllers.setEntityControllerForType(EntityType.SPIDER, SpiderController.class); + EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); + EntityControllers.setEntityControllerForType(EntityType.SQUID, SquidController.class); + EntityControllers.setEntityControllerForType(EntityType.TIPPED_ARROW, TippedArrowController.class); + EntityControllers.setEntityControllerForType(EntityType.THROWN_EXP_BOTTLE, ThrownExpBottleController.class); + EntityControllers.setEntityControllerForType(EntityType.TRIDENT, ThrownTridentController.class); + EntityControllers.setEntityControllerForType(EntityType.TROPICAL_FISH, TropicalFishController.class); + EntityControllers.setEntityControllerForType(EntityType.TURTLE, TurtleController.class); + EntityControllers.setEntityControllerForType(EntityType.PRIMED_TNT, TNTPrimedController.class); + EntityControllers.setEntityControllerForType(EntityType.VEX, VexController.class); + EntityControllers.setEntityControllerForType(EntityType.VILLAGER, VillagerController.class); + EntityControllers.setEntityControllerForType(EntityType.VINDICATOR, VindicatorController.class); + EntityControllers.setEntityControllerForType(EntityType.WOLF, WolfController.class); + EntityControllers.setEntityControllerForType(EntityType.WITCH, WitchController.class); + EntityControllers.setEntityControllerForType(EntityType.WITHER, WitherController.class); + EntityControllers.setEntityControllerForType(EntityType.WITHER_SKULL, WitherSkullController.class); + EntityControllers.setEntityControllerForType(EntityType.WITHER_SKELETON, SkeletonWitherController.class); + EntityControllers.setEntityControllerForType(EntityType.ZOMBIE, ZombieController.class); + 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); + if (handle == null) + return; + yaw = Util.clampYaw(yaw); + handle.yaw = yaw; + setHeadYaw(entity, yaw); + handle.pitch = pitch; + } + + @Override + public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) { + Entity handle = NMSImpl.getHandle(entity); + if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType()) + || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) { + Location fromLocation = entity.getLocation(FROM_LOCATION); + double xDiff, yDiff, zDiff; + xDiff = to.getX() - fromLocation.getX(); + yDiff = to.getY() - fromLocation.getY(); + zDiff = to.getZ() - fromLocation.getZ(); + + double distanceXZ = Math.sqrt(xDiff * xDiff + zDiff * zDiff); + double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff); + + double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ)); + double pitch = Math.toDegrees(Math.acos(yDiff / distanceY)) - 90; + if (zDiff < 0.0) + yaw += Math.abs(180 - yaw) * 2; + if (handle instanceof EntityEnderDragon) { + yaw = getDragonYaw(handle, to.getX(), to.getZ()); + } else { + yaw = yaw - 90; + } + if (headOnly) { + setHeadYaw(entity, (float) yaw); + } else { + look(entity, (float) yaw, (float) pitch); + } + return; + } + if (handle instanceof EntityInsentient) { + ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), + ((EntityInsentient) handle).L(), ((EntityInsentient) handle).K()); + + while (((EntityLiving) handle).aS >= 180F) { + ((EntityLiving) handle).aS -= 360F; + } + while (((EntityLiving) handle).aS < -180F) { + ((EntityLiving) handle).aS += 360F; + } + } else if (handle instanceof EntityHumanNPC) { + ((EntityHumanNPC) handle).setTargetLook(to); + } + } + + @Override + public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) { + Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to); + BAD_CONTROLLER_LOOK.add(EntityType.SHULKER); + if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())) { + if (to instanceof LivingEntity) { + look(from, ((LivingEntity) to).getEyeLocation(), false, true); + } else { + look(from, to.getLocation(), false, true); + } + } else if (handle instanceof EntityInsentient) { + ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).L(), + ((EntityInsentient) handle).K()); + while (((EntityLiving) handle).aS >= 180F) { + ((EntityLiving) handle).aS -= 360F; + } + while (((EntityLiving) handle).aS < -180F) { + ((EntityLiving) handle).aS += 360F; + } + } else if (handle instanceof EntityHumanNPC) { + ((EntityHumanNPC) handle).setTargetLook(target, 10F, 40F); + } + } + + @Override + public void mount(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity passenger) { + if (NMSImpl.getHandle(passenger) == null) + return; + NMSImpl.getHandle(passenger).startRiding(NMSImpl.getHandle(entity)); + } + + @Override + public void openHorseScreen(Tameable horse, Player equipper) { + EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse); + EntityLiving equipperHandle = NMSImpl.getHandle(equipper); + if (handle == null || equipperHandle == null) + return; + boolean wasTamed = horse.isTamed(); + horse.setTamed(true); + ((EntityHorseAbstract) handle).c((EntityHuman) equipperHandle); + horse.setTamed(wasTamed); + } + + @Override + public void playAnimation(PlayerAnimation animation, Player player, int radius) { + PlayerAnimationImpl.play(animation, player, radius); + } + + @Override + public void registerEntityClass(Class clazz) { + if (ENTITY_REGISTRY == null) + return; + + Class search = clazz; + while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) { + EntityTypes type = ENTITY_REGISTRY.findType(search); + MinecraftKey key = ENTITY_REGISTRY.b(type); + if (key == null) + continue; + int code = ENTITY_REGISTRY.a(type); + ENTITY_REGISTRY.put(code, key, type); + return; + } + throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString()); + } + + @Override + public void removeFromServerPlayerList(Player player) { + EntityPlayer handle = (EntityPlayer) NMSImpl.getHandle(player); + ((CraftServer) Bukkit.getServer()).getHandle().players.remove(handle); + } + + @Override + public void removeFromWorld(org.bukkit.entity.Entity entity) { + Preconditions.checkNotNull(entity); + + Entity nmsEntity = ((CraftEntity) entity).getHandle(); + nmsEntity.world.removeEntity(nmsEntity); + } + + @Override + public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) { + EntityFishingHook hook = (EntityFishingHook) NMSImpl.getHandle(entity); + if (hook.hooked == null) + return; + NPC npc = npcRegistry.getNPC(hook.hooked.getBukkitEntity()); + if (npc == null) + return; + if (npc.isProtected()) { + hook.hooked = null; + hook.die(); + } + } + + @Override + public void replaceTrackerEntry(Player player) { + WorldServer server = (WorldServer) NMSImpl.getHandle(player).getWorld(); + EntityTrackerEntry entry = server.getTracker().trackedEntities.get(player.getEntityId()); + if (entry == null) + return; + PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry); + server.getTracker().trackedEntities.a(player.getEntityId(), replace); + if (TRACKED_ENTITY_SET != null) { + try { + Set set = (Set) TRACKED_ENTITY_SET.get(server.getTracker()); + set.remove(entry); + set.add(replace); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + if (getHandle(player) instanceof EntityHumanNPC) { + ((EntityHumanNPC) getHandle(player)).setTracked(); + } + } + + @Override + public void sendPositionUpdate(Player excluding, org.bukkit.entity.Entity from, Location storedLocation) { + sendPacketNearby(excluding, storedLocation, new PacketPlayOutEntityTeleport(getHandle(from))); + } + + @Override + public void sendTabListAdd(Player recipient, Player listPlayer) { + Preconditions.checkNotNull(recipient); + Preconditions.checkNotNull(listPlayer); + + EntityPlayer entity = ((CraftPlayer) listPlayer).getHandle(); + + NMSImpl.sendPacket(recipient, + new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + } + + @Override + public void sendTabListRemove(Player recipient, Collection skinnableNPCs) { + Preconditions.checkNotNull(recipient); + Preconditions.checkNotNull(skinnableNPCs); + + EntityPlayer[] entities = new EntityPlayer[skinnableNPCs.size()]; + int i = 0; + for (SkinnableEntity skinnable : skinnableNPCs) { + entities[i] = (EntityPlayer) skinnable; + i++; + } + + NMSImpl.sendPacket(recipient, + new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities)); + } + + @Override + public void sendTabListRemove(Player recipient, Player listPlayer) { + Preconditions.checkNotNull(recipient); + Preconditions.checkNotNull(listPlayer); + + EntityPlayer entity = ((CraftPlayer) listPlayer).getHandle(); + + NMSImpl.sendPacket(recipient, + new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entity)); + } + + @Override + public void setDestination(org.bukkit.entity.Entity entity, double x, double y, double z, float speed) { + Entity handle = NMSImpl.getHandle(entity); + if (handle == null) + return; + if (handle instanceof EntityInsentient) { + ((EntityInsentient) handle).getControllerMove().a(x, y, z, speed); + } else if (handle instanceof EntityHumanNPC) { + ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed); + } + } + + @Override + public void setDummyAdvancement(Player entity) { + try { + ADVANCEMENT_PLAYER_FIELD.set(getHandle(entity), DummyPlayerAdvancementData.INSTANCE); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + + @Override + public void setHeadYaw(org.bukkit.entity.Entity entity, float yaw) { + if (!(entity instanceof LivingEntity)) + return; + EntityLiving handle = (EntityLiving) getHandle(entity); + yaw = Util.clampYaw(yaw); + handle.aR = yaw; + if (!(handle instanceof EntityHuman)) { + handle.aQ = yaw; + } + handle.aS = yaw; + } + + @Override + public void setKnockbackResistance(LivingEntity entity, double d) { + EntityLiving handle = NMSImpl.getHandle(entity); + handle.getAttributeInstance(GenericAttributes.c).setValue(d); + } + + @Override + public void setNavigationTarget(org.bukkit.entity.Entity handle, org.bukkit.entity.Entity target, float speed) { + NMSImpl.getNavigation(handle).a(NMSImpl.getHandle(target), speed); + } + + @Override + public void setPeekShulker(org.bukkit.entity.Entity shulker, int peek) { + ((EntityShulker) getHandle(shulker)).a((byte) peek); + } + + @Override + public void setProfile(SkullMeta meta, GameProfile profile) { + if (SKULL_PROFILE_FIELD == null) { + try { + SKULL_PROFILE_FIELD = meta.getClass().getDeclaredField("profile"); + SKULL_PROFILE_FIELD.setAccessible(true); + } catch (Exception e) { + return; + } + } + try { + SKULL_PROFILE_FIELD.set(meta, profile); + } catch (Exception e) { + } + } + + @Override + public void setShouldJump(org.bukkit.entity.Entity entity) { + Entity handle = NMSImpl.getHandle(entity); + if (handle == null) + return; + if (handle instanceof EntityInsentient) { + ControllerJump controller = ((EntityInsentient) handle).getControllerJump(); + controller.a(); + } else if (handle instanceof EntityHumanNPC) { + ((EntityHumanNPC) handle).setShouldJump(); + } + } + + @Override + public void setSitting(Tameable tameable, boolean sitting) { + ((EntityTameableAnimal) NMSImpl.getHandle((LivingEntity) tameable)).setSitting(sitting); + } + + @Override + public void setStepHeight(org.bukkit.entity.Entity entity, float height) { + NMSImpl.getHandle(entity).P = height; + } + + @Override + public void setVerticalMovement(org.bukkit.entity.Entity bukkitEntity, double d) { + if (!bukkitEntity.getType().isAlive()) + return; + EntityLiving handle = NMSImpl.getHandle((LivingEntity) bukkitEntity); + handle.bh = (float) d; + } + + @Override + public void setWitherCharged(Wither wither, boolean charged) { + EntityWither handle = ((CraftWither) wither).getHandle(); + handle.g(charged ? 20 : 0); + } + + @Override + public boolean shouldJump(org.bukkit.entity.Entity entity) { + if (JUMP_FIELD == null || !(entity instanceof LivingEntity)) + return false; + try { + return JUMP_FIELD.getBoolean(NMSImpl.getHandle(entity)); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return false; + } + + @Override + public void shutdown() { + if (ENTITY_REGISTRY == null) + return; + Field field = NMS.getField(EntityTypes.class, "b"); + Field modifiersField = NMS.getField(Field.class, "modifiers"); + try { + modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); + field.set(null, ENTITY_REGISTRY.getWrapped()); + } catch (Exception e) { + } + } + + @Override + public boolean tick(org.bukkit.entity.Entity next) { + Entity entity = NMSImpl.getHandle(next); + Entity entity1 = entity.getVehicle(); + if (entity1 != null) { + if ((entity1.dead) || (!entity1.w(entity))) { + entity.stopRiding(); + } + } else { + if (!entity.dead) { + try { + entity.world.entityJoinedWorld(entity, true); + } catch (Throwable throwable) { + CrashReport crashreport = CrashReport.a(throwable, "Ticking player"); + CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Player being ticked"); + + entity.appendEntityCrashDetails(crashreportsystemdetails); + throw new ReportedException(crashreport); + } + } + boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist", + Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean()); + if (entity.dead) { + entity.world.removeEntity(entity); + return true; + } else if (!removeFromPlayerList) { + if (!entity.world.players.contains(entity)) { + entity.world.players.add((EntityHuman) entity); + } + return true; + } else { + entity.world.players.remove(entity); + } + } + return false; + } + + @Override + public void trySwim(org.bukkit.entity.Entity entity) { + trySwim(entity, 0.04F); + } + + @Override + public void trySwim(org.bukkit.entity.Entity entity, float power) { + Entity handle = NMSImpl.getHandle(entity); + if (handle == null) + return; + if (RANDOM.nextFloat() < 0.8F && (handle.at() || handle.ax())) { + handle.motY += power; + } + } + + @Override + public void updateNavigationWorld(org.bukkit.entity.Entity entity, World world) { + if (NAVIGATION_WORLD_FIELD == null) + return; + Entity en = NMSImpl.getHandle(entity); + if (en == null || !(en instanceof EntityInsentient)) + return; + EntityInsentient handle = (EntityInsentient) en; + WorldServer worldHandle = ((CraftWorld) world).getHandle(); + try { + NAVIGATION_WORLD_FIELD.set(handle.getNavigation(), worldHandle); + } catch (Exception e) { + Messaging.logTr(Messages.ERROR_UPDATING_NAVIGATION_WORLD, e.getMessage()); + } + } + + @Override + public void updatePathfindingRange(NPC npc, float pathfindingRange) { + if (!npc.isSpawned() || !npc.getEntity().getType().isAlive()) + return; + EntityLiving en = NMSImpl.getHandle((LivingEntity) npc.getEntity()); + if (!(en instanceof EntityInsentient)) { + if (en instanceof EntityHumanNPC) { + ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange); + } + return; + } + if (PATHFINDING_RANGE == null) + return; + EntityInsentient handle = (EntityInsentient) en; + NavigationAbstract navigation = handle.getNavigation(); + try { + AttributeInstance inst = (AttributeInstance) PATHFINDING_RANGE.get(navigation); + inst.setValue(pathfindingRange); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + + private static class NavigationFieldWrapper implements TargetNavigator { + private final NavigationAbstract navigation; + private final NavigatorParameters parameters; + private final org.bukkit.entity.Entity target; + + private NavigationFieldWrapper(NavigationAbstract navigation, org.bukkit.entity.Entity target, + NavigatorParameters parameters) { + this.navigation = navigation; + this.target = target; + this.parameters = parameters; + } + + @Override + public Iterable getPath() { + return new NavigationIterable(navigation); + } + + @Override + public void setPath() { + Location location = parameters.entityTargetLocationMapper().apply(target); + if (location == null) { + throw new IllegalStateException("mapper should not return null"); + } + navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed()); + } + + @Override + public void stop() { + stopNavigation(navigation); + } + + @Override + public void update() { + updateNavigation(navigation); + } + } + + private static class NavigationIterable implements Iterable { + private final NavigationAbstract navigation; + + public NavigationIterable(NavigationAbstract nav) { + this.navigation = nav; + } + + @Override + public Iterator iterator() { + final int npoints = navigation.n() == null ? 0 : navigation.n().d(); + return new Iterator() { + PathPoint curr = npoints > 0 ? navigation.n().a(0) : null; + int i = 0; + + @Override + public boolean hasNext() { + return curr != null; + } + + @Override + public Vector next() { + PathPoint old = curr; + curr = i + 1 < npoints ? navigation.n().a(++i) : null; + return new Vector(old.a, old.b, old.c); + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + }; + } + } + + public static void clearGoals(PathfinderGoalSelector... goalSelectors) { + if (GOAL_FIELD == null || goalSelectors == null) + return; + for (PathfinderGoalSelector selector : goalSelectors) { + try { + Collection list = (Collection) GOAL_FIELD.get(selector); + list.clear(); + } catch (Exception e) { + Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage()); + } + } + } + + public static void flyingMoveLogic(EntityLiving entity, float f, float f1, float f2) { + if ((entity.cO()) || (entity.bT())) { + double d0 = 0.08D; + if ((entity.motY <= 0.0D) && (entity.hasEffect(MobEffects.SLOW_FALLING))) { + d0 = 0.01D; + entity.fallDistance = 0.0F; + } + if ((entity.isInWater()) + && ((!(entity instanceof EntityHuman)) || (!((EntityHuman) entity).abilities.isFlying))) { + double d2 = entity.locY; + float f5 = entity instanceof EntityPolarBear ? 0.98F : 0.8F; + + float f4 = 0.02F; + float f3 = EnchantmentManager.e(entity); + if (f3 > 3.0F) { + f3 = 3.0F; + } + if (!entity.onGround) { + f3 *= 0.5F; + } + if (f3 > 0.0F) { + f5 += (0.54600006F - f5) * f3 / 3.0F; + f4 += (entity.cJ() - f4) * f3 / 3.0F; + } + if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) { + f5 = 0.96F; + } + entity.a(f, f1, f2, f4); + entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ); + entity.motX *= f5; + entity.motY *= 0.800000011920929D; + entity.motZ *= f5; + if ((!entity.isNoGravity()) && (!entity.isSprinting())) { + if ((entity.motY <= 0.0D) && (Math.abs(entity.motY - 0.005D) >= 0.003D) + && (Math.abs(entity.motY - d0 / 16.0D) < 0.003D)) { + entity.motY = -0.003D; + } else { + entity.motY -= d0 / 16.0D; + } + } + if ((entity.positionChanged) + && (entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ))) { + entity.motY = 0.30000001192092896D; + } + } else if ((entity.ax()) + && ((!(entity instanceof EntityHuman)) || (!((EntityHuman) entity).abilities.isFlying))) { + double d2 = entity.locY; + entity.a(f, f1, f2, 0.02F); + entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ); + entity.motX *= 0.5D; + entity.motY *= 0.5D; + entity.motZ *= 0.5D; + if (!entity.isNoGravity()) { + entity.motY -= d0 / 4.0D; + } + if ((entity.positionChanged) + && (entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ))) { + entity.motY = 0.30000001192092896D; + } + } else if (entity.db()) { + if (entity.motY > -0.5D) { + entity.fallDistance = 1.0F; + } + Vec3D vec3d = entity.aN(); + float f6 = entity.pitch * 0.017453292F; + + double d1 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z); + double d3 = Math.sqrt(entity.motX * entity.motX + entity.motZ * entity.motZ); + double d4 = vec3d.b(); + float f7 = MathHelper.cos(f6); + + f7 = (float) (f7 * f7 * Math.min(1.0D, d4 / 0.4D)); + entity.motY += d0 * (-1.0D + f7 * 0.75D); + if ((entity.motY < 0.0D) && (d1 > 0.0D)) { + double d5 = entity.motY * -0.1D * f7; + entity.motY += d5; + entity.motX += vec3d.x * d5 / d1; + entity.motZ += vec3d.z * d5 / d1; + } + if ((f6 < 0.0F) && (d1 > 0.0D)) { + double d5 = d3 * -MathHelper.sin(f6) * 0.04D; + entity.motY += d5 * 3.2D; + entity.motX -= vec3d.x * d5 / d1; + entity.motZ -= vec3d.z * d5 / d1; + } + if (d1 > 0.0D) { + entity.motX += (vec3d.x / d1 * d3 - entity.motX) * 0.1D; + entity.motZ += (vec3d.z / d1 * d3 - entity.motZ) * 0.1D; + } + entity.motX *= 0.9900000095367432D; + entity.motY *= 0.9800000190734863D; + entity.motZ *= 0.9900000095367432D; + entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ); + if ((entity.positionChanged) && (!entity.world.isClientSide)) { + double d5 = Math.sqrt(entity.motX * entity.motX + entity.motZ * entity.motZ); + double d6 = d3 - d5; + float f8 = (float) (d6 * 10.0D - 3.0D); + if (f8 > 0.0F) { + entity.a(f8 > 4 ? SoundEffects.ENTITY_GENERIC_BIG_FALL : SoundEffects.ENTITY_GENERIC_SMALL_FALL, + 1.0F, 1.0F); + entity.damageEntity(DamageSource.FLY_INTO_WALL, f8); + } + } + if ((entity.onGround) && (!entity.world.isClientSide) && (entity.getFlag(7)) + && (!CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())) { + entity.setFlag(7, false); + } + } else { + float f9 = 0.91F; + BlockPosition.b blockposition_b = BlockPosition.b.d(entity.locX, entity.getBoundingBox().b - 1.0D, + entity.locZ); + Throwable throwable = null; + float f4; + float f3; + try { + if (entity.onGround) { + f9 = entity.world.getType(blockposition_b).getBlock().n() * 0.91F; + } + f4 = 0.16277137F / (f9 * f9 * f9); + if (entity.onGround) { + f3 = entity.cJ() * f4; + } else { + f3 = entity.aU; + } + entity.a(f, f1, f2, f3); + f9 = 0.91F; + if (entity.onGround) { + f9 = entity.world + .getType(blockposition_b.e(entity.locX, entity.getBoundingBox().b - 1.0D, entity.locZ)) + .getBlock().n() * 0.91F; + } + if (entity.z_()) { + entity.motX = MathHelper.a(entity.motX, -0.15000000596046448D, 0.15000000596046448D); + entity.motZ = MathHelper.a(entity.motZ, -0.15000000596046448D, 0.15000000596046448D); + entity.fallDistance = 0.0F; + if (entity.motY < -0.15D) { + entity.motY = -0.15D; + } + boolean flag = (entity.isSneaking()) && ((entity instanceof EntityHuman)); + if ((flag) && (entity.motY < 0.0D)) { + entity.motY = 0.0D; + } + } + entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ); + if ((entity.positionChanged) && (entity.z_())) { + entity.motY = 0.2D; + } + if (entity.hasEffect(MobEffects.LEVITATION)) { + entity.motY += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1) + - entity.motY) * 0.2D; + entity.fallDistance = 0.0F; + } else { + blockposition_b.e(entity.locX, 0.0D, entity.locZ); + if ((entity.world.isClientSide) && ((!entity.world.isLoaded(blockposition_b)) + || (!entity.world.getChunkAtWorldCoords(blockposition_b).y()))) { + if (entity.locY > 0.0D) { + entity.motY = -0.1D; + } else { + entity.motY = 0.0D; + } + } else if (!entity.isNoGravity()) { + entity.motY -= d0; + } + } + entity.motY *= 0.9800000190734863D; + entity.motX *= f9; + entity.motZ *= f9; + } catch (Throwable throwable1) { + throwable = throwable1; + throw throwable1; + } finally { + if (blockposition_b != null) { + if (throwable != null) { + try { + blockposition_b.close(); + } catch (Throwable throwable2) { + throwable.addSuppressed(throwable2); + } + } else { + blockposition_b.close(); + } + } + } + } + } + entity.aI = entity.aJ; + double d0 = entity.locX - entity.lastX; + double d2 = entity.locZ - entity.lastZ; + double d1 = (entity instanceof EntityBird) ? entity.locY - entity.lastY : 0.0D; + float f3 = MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 4.0F; + if (f3 > 1.0F) { + f3 = 1.0F; + } + entity.aJ += (f3 - entity.aJ) * 0.4F; + entity.aK += entity.aJ; + } + + public static BossBar getBossBar(org.bukkit.entity.Entity entity) { + BossBattleServer bserver = null; + try { + if (entity.getType() == EntityType.WITHER) { + bserver = (BossBattleServer) WITHER_BOSS_BAR_FIELD.get(NMSImpl.getHandle(entity)); + } else if (entity.getType() == EntityType.ENDER_DRAGON) { + bserver = (BossBattleServer) ENDERDRAGON_BATTLE_BAR_FIELD + .get(ENDERDRAGON_BATTLE_FIELD.get(NMSImpl.getHandle(entity))); + } + } catch (Exception e) { + } + if (bserver == null) { + return null; + } + BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10); + try { + CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver); + } catch (Exception e) { + } + return ret; + } + + private static EntityLiving getHandle(LivingEntity entity) { + return (EntityLiving) NMSImpl.getHandle((org.bukkit.entity.Entity) entity); + } + + public static Entity getHandle(org.bukkit.entity.Entity entity) { + if (!(entity instanceof CraftEntity)) + return null; + return ((CraftEntity) entity).getHandle(); + } + + public static float getHeadYaw(EntityLiving handle) { + return handle.getHeadRotation(); + } + + public static NavigationAbstract getNavigation(org.bukkit.entity.Entity entity) { + Entity handle = getHandle(entity); + return handle instanceof EntityInsentient ? ((EntityInsentient) handle).getNavigation() + : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getNavigation() : null; + } + + public static DataWatcherObject getRabbitTypeField() { + if (RABBIT_FIELD == null) + return null; + try { + return (DataWatcherObject) RABBIT_FIELD.get(null); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return null; + } + + public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) { + return npc == null || !npc.data().has(meta) ? snd + : SoundEffect.a.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString()))); + } + + public static void initNetworkManager(NetworkManager network) { + if (NETWORK_ADDRESS == null) + return; + try { + network.channel = new EmptyChannel(null); + NETWORK_ADDRESS.set(network, new SocketAddress() { + private static final long serialVersionUID = 8207338859896320185L; + }); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + + public static boolean isNavigationFinished(NavigationAbstract navigation) { + return navigation.q(); + } + + @SuppressWarnings("deprecation") + public static void minecartItemLogic(EntityMinecartAbstract minecart) { + NPC npc = ((NPCHolder) minecart).getNPC(); + if (npc == null) + return; + Material mat = Material.getMaterial(npc.data().get(NPC.MINECART_ITEM_METADATA, "")); + int data = npc.data().get(NPC.MINECART_ITEM_DATA_METADATA, 0); // TODO: migration for this + int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); + minecart.a(mat != null); + if (mat != null) { + minecart.setDisplayBlock(Block.getById(mat.getId()).getBlockData()); + } + minecart.setDisplayBlockOffset(offset); + } + + public static void sendPacket(Player player, Packet packet) { + if (packet == null) + return; + ((EntityPlayer) NMSImpl.getHandle(player)).playerConnection.sendPacket(packet); + } + + public static void sendPacketNearby(Player from, Location location, Packet packet) { + sendPacketNearby(from, location, packet, 64); + } + + public static void sendPacketNearby(Player from, Location location, Packet packet, double radius) { + List> list = new ArrayList>(); + list.add(packet); + sendPacketsNearby(from, location, list, radius); + } + + public static void sendPacketsNearby(Player from, Location location, Collection> packets, double radius) { + radius *= radius; + final org.bukkit.World world = location.getWorld(); + for (Player ply : Bukkit.getServer().getOnlinePlayers()) { + if (ply == null || world != ply.getWorld() || (from != null && !ply.canSee(from))) { + continue; + } + if (location.distanceSquared(ply.getLocation(PACKET_CACHE_LOCATION)) > radius) { + continue; + } + for (Packet packet : packets) { + NMSImpl.sendPacket(ply, packet); + } + } + } + + public static void sendPacketsNearby(Player from, Location location, Packet... packets) { + NMSImpl.sendPacketsNearby(from, location, Arrays.asList(packets), 64); + } + + public static void setShulkerColor(Shulker shulker, DyeColor color) { + ((EntityShulker) getHandle(shulker)).getDataWatcher().set(EntityShulker.COLOR, color.getWoolData()); + } + + public static void setSize(Entity entity, float f, float f1, boolean justCreated) { + if ((f != entity.width) || (f1 != entity.length)) { + float f2 = entity.width; + + entity.width = f; + entity.length = f1; + entity.a(new AxisAlignedBB(entity.getBoundingBox().a, entity.getBoundingBox().b, entity.getBoundingBox().c, + entity.getBoundingBox().a + entity.width, entity.getBoundingBox().b + entity.length, + entity.getBoundingBox().c + entity.width)); + if ((entity.width > f2) && (!justCreated) && (!entity.world.isClientSide)) + entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2); + } + } + + public static void stopNavigation(NavigationAbstract navigation) { + navigation.r(); + } + + public static void updateAI(EntityLiving entity) { + if (entity instanceof EntityInsentient) { + EntityInsentient handle = (EntityInsentient) entity; + handle.getEntitySenses().a(); + NMSImpl.updateNavigation(handle.getNavigation()); + handle.getControllerMove().a(); + handle.getControllerLook().a(); + handle.getControllerJump().b(); + } else if (entity instanceof EntityHumanNPC) { + ((EntityHumanNPC) entity).updateAI(); + } + } + + public static void updateNavigation(NavigationAbstract navigation) { + navigation.d(); + }; + + private static Field ADVANCEMENT_PLAYER_FIELD = NMS.getFinalField(EntityPlayer.class, "cg"); + private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.SILVERFISH, + EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, + EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST); + private static final Field CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getField(CraftBossBar.class, "handle"); + private static final float DEFAULT_SPEED = 1F; + private static final Field ENDERDRAGON_BATTLE_BAR_FIELD = NMS.getField(EnderDragonBattle.class, "c"); + private static final Field ENDERDRAGON_BATTLE_FIELD = NMS.getField(EntityEnderDragon.class, "bR"); + private static CustomEntityRegistry ENTITY_REGISTRY; + private static final Location FROM_LOCATION = new Location(null, 0, 0, 0); + public static Field GOAL_FIELD = NMS.getField(PathfinderGoalSelector.class, "b"); + private static final Field JUMP_FIELD = NMS.getField(EntityLiving.class, "bg"); + private static Method MAKE_REQUEST; + private static Field NAVIGATION_WORLD_FIELD = NMS.getField(NavigationAbstract.class, "b"); + public static Field NETWORK_ADDRESS = NMS.getField(NetworkManager.class, "l"); + public static final Location PACKET_CACHE_LOCATION = new Location(null, 0, 0, 0); + private static Field PATHFINDING_RANGE = NMS.getField(NavigationAbstract.class, "p"); + private static final Field RABBIT_FIELD = NMS.getField(EntityRabbit.class, "bC"); + private static final Random RANDOM = Util.getFastRandom(); + private static Field SKULL_PROFILE_FIELD; + private static Field TRACKED_ENTITY_SET = NMS.getField(EntityTracker.class, "c"); + private static final Field WITHER_BOSS_BAR_FIELD = NMS.getField(EntityWither.class, "bL"); + + static { + try { + Field field = NMS.getFinalField(EntityTypes.class, "REGISTRY"); + ENTITY_REGISTRY = new CustomEntityRegistry( + (RegistryMaterials>) field.get(null)); + field.set(null, ENTITY_REGISTRY); + } catch (Exception e) { + Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage()); + } + + try { + MAKE_REQUEST = YggdrasilAuthenticationService.class.getDeclaredMethod("makeRequest", URL.class, + Object.class, Class.class); + MAKE_REQUEST.setAccessible(true); + } catch (Exception ex) { + ex.printStackTrace(); + } + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java new file mode 100644 index 000000000..abf8e70f3 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java @@ -0,0 +1,143 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.util.EnumMap; + +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.metadata.FixedMetadataValue; +import org.bukkit.scheduler.BukkitRunnable; + +import com.google.common.collect.Maps; + +import net.citizensnpcs.api.CitizensAPI; +import net.citizensnpcs.api.npc.MemoryNPCDataStore; +import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.npc.NPCRegistry; +import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.trait.ArmorStandTrait; +import net.citizensnpcs.util.NMS; +import net.citizensnpcs.util.PlayerAnimation; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.EnumHand; +import net.minecraft.server.v1_13_R1.Packet; +import net.minecraft.server.v1_13_R1.PacketPlayOutAnimation; +import net.minecraft.server.v1_13_R1.PacketPlayOutBed; +import net.minecraft.server.v1_13_R1.PacketPlayOutEntityMetadata; + +public class PlayerAnimationImpl { + public static void play(PlayerAnimation animation, Player bplayer, int radius) { + // TODO: this is pretty gross + final EntityPlayer player = (EntityPlayer) NMSImpl.getHandle(bplayer); + if (DEFAULTS.containsKey(animation)) { + playDefaultAnimation(player, radius, DEFAULTS.get(animation)); + return; + } + switch (animation) { + case SIT: + player.getBukkitEntity().setMetadata("citizens.sitting", + new FixedMetadataValue(CitizensAPI.getPlugin(), true)); + NPCRegistry registry = CitizensAPI.getNamedNPCRegistry("PlayerAnimationImpl"); + if (registry == null) { + registry = CitizensAPI.createNamedNPCRegistry("PlayerAnimationImpl", new MemoryNPCDataStore()); + } + final NPC holder = registry.createNPC(EntityType.ARMOR_STAND, ""); + holder.spawn(player.getBukkitEntity().getLocation()); + ArmorStandTrait trait = holder.getTrait(ArmorStandTrait.class); + trait.setGravity(false); + trait.setHasArms(false); + trait.setHasBaseplate(false); + trait.setSmall(true); + trait.setMarker(true); + trait.setVisible(false); + holder.data().set(NPC.NAMEPLATE_VISIBLE_METADATA, false); + holder.data().set(NPC.DEFAULT_PROTECTED_METADATA, true); + new BukkitRunnable() { + @Override + public void cancel() { + super.cancel(); + holder.destroy(); + } + + @Override + public void run() { + if (player.dead || !player.valid + || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { + cancel(); + return; + } + if (player instanceof NPCHolder && !((NPCHolder) player).getNPC().isSpawned()) { + cancel(); + return; + } + if (!NMS.getPassengers(holder.getEntity()).contains(player.getBukkitEntity())) { + NMS.mount(holder.getEntity(), player.getBukkitEntity()); + } + } + }.runTaskTimer(CitizensAPI.getPlugin(), 0, 1); + break; + case SLEEP: + PacketPlayOutBed packet = new PacketPlayOutBed(player, + new BlockPosition((int) player.locX, (int) player.locY, (int) player.locZ)); + sendPacketNearby(packet, player, radius); + break; + case SNEAK: + player.getBukkitEntity().setSneaking(true); + sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player, + radius); + break; + case START_ELYTRA: + player.J(); + break; + case START_USE_MAINHAND_ITEM: + player.c(EnumHand.MAIN_HAND); + sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player, + radius); + break; + case START_USE_OFFHAND_ITEM: + player.c(EnumHand.OFF_HAND); + sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player, + radius); + break; + case STOP_SITTING: + player.getBukkitEntity().setMetadata("citizens.sitting", + new FixedMetadataValue(CitizensAPI.getPlugin(), false)); + NMS.mount(player.getBukkitEntity(), null); + break; + case STOP_SLEEPING: + playDefaultAnimation(player, radius, 2); + break; + case STOP_SNEAKING: + player.getBukkitEntity().setSneaking(false); + sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player, + radius); + break; + case STOP_USE_ITEM: + player.clearActiveItem(); + sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player, + radius); + break; + default: + throw new UnsupportedOperationException(); + } + } + + protected static void playDefaultAnimation(EntityPlayer player, int radius, int code) { + PacketPlayOutAnimation packet = new PacketPlayOutAnimation(player, code); + sendPacketNearby(packet, player, radius); + } + + protected static void sendPacketNearby(Packet packet, EntityPlayer player, int radius) { + NMSImpl.sendPacketNearby(player.getBukkitEntity(), player.getBukkitEntity().getLocation(), packet, radius); + } + + private static EnumMap DEFAULTS = Maps.newEnumMap(PlayerAnimation.class); + static { + DEFAULTS.put(PlayerAnimation.ARM_SWING, 0); + DEFAULTS.put(PlayerAnimation.HURT, 1); + DEFAULTS.put(PlayerAnimation.EAT_FOOD, 2); + DEFAULTS.put(PlayerAnimation.ARM_SWING_OFFHAND, 3); + DEFAULTS.put(PlayerAnimation.CRIT, 4); + DEFAULTS.put(PlayerAnimation.MAGIC_CRIT, 5); + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java new file mode 100644 index 000000000..88ae4f4be --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java @@ -0,0 +1,21 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; + +public class PlayerControllerJump { + private final EntityHumanNPC a; + private boolean b; + + public PlayerControllerJump(EntityHumanNPC entityinsentient) { + this.a = entityinsentient; + } + + public void a() { + this.b = true; + } + + public void b() { + this.a.o(this.b); + this.b = false; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java new file mode 100644 index 000000000..95deea452 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java @@ -0,0 +1,110 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityLiving; +import net.minecraft.server.v1_13_R1.MathHelper; + +public class PlayerControllerLook { + private final EntityHumanNPC a; + private float b; + private float c; + private boolean d; + private double e; + private double f; + private double g; + + public PlayerControllerLook(EntityHumanNPC entityinsentient) { + this.a = entityinsentient; + } + + public void a() { + if (!NMSImpl.isNavigationFinished(this.a.getNavigation())) + return; + this.a.pitch = 0.0F; + if (this.d) { + this.d = false; + + double d1 = this.e - this.a.locX; + double d2 = this.f - (this.a.locY + this.a.getHeadHeight()); + double d3 = this.g - this.a.locZ; + double d4 = MathHelper.sqrt(d1 * d1 + d3 * d3); + + float f1 = (float) (MathHelper.c(d3, d1) * 57.2957763671875D) - 90.0F; + float f2 = (float) -(MathHelper.c(d2, d4) * 57.2957763671875D); + this.a.pitch = a(this.a.pitch, f2, this.c); + this.a.aS = a(this.a.aS, f1, this.b); + this.a.yaw = this.a.aS; + while (this.a.aS >= 180F) { + this.a.aS -= 360F; + } + while (this.a.aS < -180F) { + this.a.aS += 360F; + } + } else { + // this.a.aP = a(this.a.aS, this.a.aQ, 10.0F); + } + float f3 = MathHelper.g(this.a.aS - this.a.aQ); + if (!this.a.getNavigation().q()) { + if (f3 < -75.0F) { + this.a.aS = (this.a.aQ - 75.0F); + } + if (f3 > 75.0F) { + this.a.aS = (this.a.aQ + 75.0F); + } + } + } + + public void a(double d0, double d1, double d2, float f, float f1) { + this.e = d0; + this.f = d1; + this.g = d2; + this.b = f; + this.c = f1; + this.d = true; + } + + public void a(Entity entity, float f, float f1) { + this.e = entity.locX; + if ((entity instanceof EntityLiving)) + this.f = (entity.locY + entity.getHeadHeight()); + else { + this.f = ((entity.getBoundingBox().b + entity.getBoundingBox().e) / 2.0D); + } + + this.g = entity.locZ; + this.b = f; + this.c = f1; + this.d = true; + } + + private float a(float f, float f1, float f2) { + float f3 = MathHelper.g(f1 - f); + + if (f3 > f2) { + f3 = f2; + } + + if (f3 < -f2) { + f3 = -f2; + } + + return f + f3; + } + + public boolean b() { + return this.d; + } + + public double e() { + return this.e; + } + + public double f() { + return this.f; + } + + public double g() { + return this.g; + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java new file mode 100644 index 000000000..271793713 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java @@ -0,0 +1,139 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.util.Random; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.citizensnpcs.util.NMS; +import net.minecraft.server.v1_13_R1.AttributeInstance; +import net.minecraft.server.v1_13_R1.ControllerMove; +import net.minecraft.server.v1_13_R1.EntityInsentient; +import net.minecraft.server.v1_13_R1.EntityLiving; +import net.minecraft.server.v1_13_R1.EntitySlime; +import net.minecraft.server.v1_13_R1.GenericAttributes; +import net.minecraft.server.v1_13_R1.MathHelper; + +public class PlayerControllerMove extends ControllerMove { + protected EntityLiving a; + protected double b; + protected double c; + protected double d; + protected double e; + protected boolean f; + private int h; + + public PlayerControllerMove(EntityLiving entityinsentient) { + super(entityinsentient instanceof EntityInsentient ? (EntityInsentient) entityinsentient + : new EntitySlime(entityinsentient.world)); + this.a = entityinsentient; + this.b = entityinsentient.locX; + this.c = entityinsentient.locY; + this.d = entityinsentient.locZ; + } + + @Override + public void a() { + this.a.bj = 0F; + if (this.f) { + this.f = false; + int i = MathHelper.floor(this.a.getBoundingBox().b + 0.5D); + double d0 = this.b - this.a.locX; + double d1 = this.d - this.a.locZ; + double d2 = this.c - i; + double d3 = d0 * d0 + d2 * d2 + d1 * d1; + if (d3 < 2.500000277905201E-007D) { + this.a.bi = (0.0F); + return; + } + float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F; + this.a.yaw = a(this.a.yaw, f, 90.0F); + NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw); + AttributeInstance speed = this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED); + if (!(this.a instanceof EntitySlime)) { + speed.setValue(0.1D * this.e); + } + float movement = (float) (this.e * speed.getValue()) * 10; + this.a.o(movement); + this.a.bj = movement; + if (shouldSlimeJump() || ((d2 > 0.0D) && (d0 * d0 + d1 * d1 < 1.0D))) { + this.h = cg(); + this.h /= 3; + if (this.a instanceof EntityHumanNPC) { + ((EntityHumanNPC) this.a).getControllerJump().a(); + } else { + ((EntityInsentient) this.a).getControllerJump().a(); + } + } + } + } + + @Override + public void a(double d0, double d1, double d2, double d3) { + this.b = d0; + this.c = d1; + this.d = d2; + this.e = d3; + this.f = true; + } + + @Override + protected float a(float f, float f1, float f2) { + float f3 = MathHelper.g(f1 - f); + + if (f3 > f2) { + f3 = f2; + } + + if (f3 < -f2) { + f3 = -f2; + } + + float f4 = f + f3; + + if (f4 < 0.0F) + f4 += 360.0F; + else if (f4 > 360.0F) { + f4 -= 360.0F; + } + + return f4; + } + + @Override + public boolean b() { + return this.f; + } + + @Override + public double c() { + return this.e; + } + + protected int cg() { + return new Random().nextInt(20) + 10; + } + + @Override + public double d() { + return this.b; + } + + @Override + public double e() { + return this.c; + } + + @Override + public double f() { + return this.d; + } + + private boolean shouldSlimeJump() { + if (!(this.a instanceof EntitySlime)) { + return false; + } + if (this.h-- <= 0) { + return true; + } + return false; + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java new file mode 100644 index 000000000..604776edc --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java @@ -0,0 +1,521 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.minecraft.server.v1_13_R1.AttributeInstance; +import net.minecraft.server.v1_13_R1.Block; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.Blocks; +import net.minecraft.server.v1_13_R1.ChunkCache; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityInsentient; +import net.minecraft.server.v1_13_R1.EntityTypes; +import net.minecraft.server.v1_13_R1.GenericAttributes; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.MathHelper; +import net.minecraft.server.v1_13_R1.NavigationAbstract; +import net.minecraft.server.v1_13_R1.PathEntity; +import net.minecraft.server.v1_13_R1.PathMode; +import net.minecraft.server.v1_13_R1.PathPoint; +import net.minecraft.server.v1_13_R1.PathType; +import net.minecraft.server.v1_13_R1.Pathfinder; +import net.minecraft.server.v1_13_R1.PathfinderAbstract; +import net.minecraft.server.v1_13_R1.PathfinderNormal; +import net.minecraft.server.v1_13_R1.SystemUtils; +import net.minecraft.server.v1_13_R1.Vec3D; +import net.minecraft.server.v1_13_R1.World; + +public class PlayerNavigation extends NavigationAbstract { + protected EntityHumanNPC a; + protected World b; + protected PathEntity c; + protected double d; + protected int e; + protected int f; + protected Vec3D g = Vec3D.a; + protected Vec3D h = Vec3D.a; + protected long i; + protected long j; + protected double k; + protected float l = 0.5F; + protected boolean m; + protected long n; + protected PlayerPathfinderNormal o; + private final AttributeInstance p; + private boolean pp; + private BlockPosition q; + private final PlayerPathfinder r; + + public PlayerNavigation(EntityHumanNPC entityinsentient, World world) { + super(getDummyInsentient(entityinsentient, world), world); + this.a = entityinsentient; + this.b = world; + this.p = entityinsentient.getAttributeInstance(GenericAttributes.FOLLOW_RANGE); + this.setRange(24); + this.o = new PlayerPathfinderNormal(); + this.o.a(true); + this.r = new PlayerPathfinder(this.o); + // this.b.C().a(this); + } + + @Override + protected Pathfinder a() { + return null; + } + + @Override + public boolean a(BlockPosition paramBlockPosition) { + BlockPosition localBlockPosition = paramBlockPosition.down(); + return this.b.getType(localBlockPosition).f(this.b, localBlockPosition); + } + + public void a(boolean paramBoolean) { + this.o.b(paramBoolean); + } + + @Override + public void a(double paramDouble) { + this.d = paramDouble; + } + + @Override + public boolean a(double paramDouble1, double paramDouble2, double paramDouble3, double paramDouble4) { + return a(a(paramDouble1, paramDouble2, paramDouble3), paramDouble4); + } + + @Override + public PathEntity a(Entity paramEntity) { + return b(new BlockPosition(paramEntity)); + } + + @Override + public boolean a(Entity paramEntity, double paramDouble) { + PathEntity localPathEntity = a(paramEntity); + return (localPathEntity != null) && (a(localPathEntity, paramDouble)); + } + + private boolean a(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6, + Vec3D paramVec3D, double paramDouble1, double paramDouble2) { + int i = paramInt1 - paramInt4 / 2; + int j = paramInt3 - paramInt6 / 2; + if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2)) { + return false; + } + for (int k = i; k < i + paramInt4; k++) { + for (int m = j; m < j + paramInt6; m++) { + double d1 = k + 0.5D - paramVec3D.x; + double d2 = m + 0.5D - paramVec3D.z; + if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { + PathType localPathType = this.o.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5, + paramInt6, true, true); + if (localPathType == PathType.WATER) { + return false; + } + if (localPathType == PathType.LAVA) { + return false; + } + if (localPathType == PathType.OPEN) { + return false; + } + localPathType = this.o.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true, + true); + float f = this.a.a(localPathType); + if ((f < 0.0F) || (f >= 8.0F)) { + return false; + } + if ((localPathType == PathType.DAMAGE_FIRE) || (localPathType == PathType.DANGER_FIRE) + || (localPathType == PathType.DAMAGE_OTHER)) { + return false; + } + } + } + } + return true; + } + + @Override + public boolean a(PathEntity paramPathEntity, double paramDouble) { + if (paramPathEntity == null) { + this.c = null; + return false; + } + if (!paramPathEntity.a(this.c)) { + this.c = paramPathEntity; + } + E_(); + if (this.c.d() <= 0) { + return false; + } + this.d = paramDouble; + Vec3D localVec3D = c(); + this.f = this.e; + this.g = localVec3D; + return true; + } + + @Override + protected void a(Vec3D paramVec3D) { + if (this.e - this.f > 100) { + if (paramVec3D.distanceSquared(this.g) < 2.25D) { + r(); + } + this.f = this.e; + this.g = paramVec3D; + } + if ((this.c != null) && (!this.c.b())) { + Vec3D localVec3D = this.c.f(); + if (localVec3D.equals(this.h)) { + this.i += SystemUtils.b() - this.j; + } else { + this.h = localVec3D; + double d1 = paramVec3D.f(this.h); + this.k = (this.a.cJ() > 0.0F ? d1 / this.a.cJ() * 1000.0D : 0.0D); + } + if ((this.k > 0.0D) && (this.i > this.k * 3.0D)) { + this.h = Vec3D.a; + this.i = 0L; + this.k = 0.0D; + r(); + } + this.j = SystemUtils.b(); + } + } + + @Override + protected boolean a(Vec3D paramVec3D1, Vec3D paramVec3D2, int paramInt1, int paramInt2, int paramInt3) { + int i = MathHelper.floor(paramVec3D1.x); + int j = MathHelper.floor(paramVec3D1.z); + + double d1 = paramVec3D2.x - paramVec3D1.x; + double d2 = paramVec3D2.z - paramVec3D1.z; + double d3 = d1 * d1 + d2 * d2; + if (d3 < 1.0E-8D) { + return false; + } + double d4 = 1.0D / Math.sqrt(d3); + d1 *= d4; + d2 *= d4; + + paramInt1 += 2; + paramInt3 += 2; + if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) { + return false; + } + paramInt1 -= 2; + paramInt3 -= 2; + + double d5 = 1.0D / Math.abs(d1); + double d6 = 1.0D / Math.abs(d2); + + double d7 = i - paramVec3D1.x; + double d8 = j - paramVec3D1.z; + if (d1 >= 0.0D) { + d7 += 1.0D; + } + if (d2 >= 0.0D) { + d8 += 1.0D; + } + d7 /= d1; + d8 /= d2; + + int k = d1 < 0.0D ? -1 : 1; + int m = d2 < 0.0D ? -1 : 1; + int n = MathHelper.floor(paramVec3D2.x); + int i1 = MathHelper.floor(paramVec3D2.z); + int i2 = n - i; + int i3 = i1 - j; + while ((i2 * k > 0) || (i3 * m > 0)) { + if (d7 < d8) { + d7 += d5; + i += k; + i2 = n - i; + } else { + d8 += d6; + j += m; + i3 = i1 - j; + } + if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) { + return false; + } + } + return true; + } + + @Override + protected boolean b() { + return (this.a.onGround) || (s()) || (this.a.isPassenger()); + } + + @Override + public PathEntity b(BlockPosition paramBlockPosition) { + BlockPosition localBlockPosition; + if (this.b.getType(paramBlockPosition).isAir()) { + localBlockPosition = paramBlockPosition.down(); + while ((localBlockPosition.getY() > 0) && (this.b.getType(localBlockPosition).isAir())) { + localBlockPosition = localBlockPosition.down(); + } + if (localBlockPosition.getY() > 0) { + return super.b(localBlockPosition.up()); + } + while ((localBlockPosition.getY() < this.b.getHeight()) && (this.b.getType(localBlockPosition).isAir())) { + localBlockPosition = localBlockPosition.up(); + } + paramBlockPosition = localBlockPosition; + } + if (this.b.getType(paramBlockPosition).getMaterial().isBuildable()) { + localBlockPosition = paramBlockPosition.up(); + while ((localBlockPosition.getY() < this.b.getHeight()) + && (this.b.getType(localBlockPosition).getMaterial().isBuildable())) { + localBlockPosition = localBlockPosition.up(); + } + return superb(localBlockPosition); + } + return superb(paramBlockPosition); + } + + public void b(boolean paramBoolean) { + this.o.a(paramBoolean); + } + + private boolean b(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6, + Vec3D paramVec3D, double paramDouble1, double paramDouble2) { + for (BlockPosition localBlockPosition : BlockPosition.a(new BlockPosition(paramInt1, paramInt2, paramInt3), + new BlockPosition(paramInt1 + paramInt4 - 1, paramInt2 + paramInt5 - 1, paramInt3 + paramInt6 - 1))) { + double d1 = localBlockPosition.getX() + 0.5D - paramVec3D.x; + double d2 = localBlockPosition.getZ() + 0.5D - paramVec3D.z; + if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) { + if (!this.b.getType(localBlockPosition).a(this.b, localBlockPosition, PathMode.LAND)) { + return false; + } + } + } + return true; + } + + @Override + protected Vec3D c() { + return new Vec3D(this.a.locX, u(), this.a.locZ); + } + + public void c(boolean paramBoolean) { + this.o.c(paramBoolean); + } + + @Override + public void d() { + this.e += 1; + if (this.m) { + m(); + } + if (q()) { + return; + } + if (b()) { + p(); + } else if ((this.c != null) && (this.c.e() < this.c.d())) { + Vec3D localVec3D = c(); + Vec3D localObject = this.c.a(this.a, this.c.e()); + if ((localVec3D.y > localObject.y) && (!this.a.onGround) + && (MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x)) + && (MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z))) { + this.c.c(this.c.e() + 1); + } + } + o(); + if (q()) { + return; + } + Vec3D localVec3D = this.c.a(this.a); + Object localObject = new BlockPosition(localVec3D); + + this.a.getControllerMove().a(localVec3D.x, + this.b.getType(((BlockPosition) localObject).down()).isAir() ? localVec3D.y + : PathfinderNormal.a(this.b, (BlockPosition) localObject), + localVec3D.z, this.d); + } + + public void d(boolean paramBoolean) { + this.pp = paramBoolean; + } + + @Override + protected void E_() { + if (this.c == null) { + return; + } + for (int i1 = 0; i1 < this.c.d(); i1++) { + PathPoint localPathPoint = this.c.a(i1); + Object localObject = i1 + 1 < this.c.d() ? this.c.a(i1 + 1) : null; + + IBlockData localIBlockData = this.b + .getType(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c)); + Block localBlock = localIBlockData.getBlock(); + if (localBlock == Blocks.CAULDRON) { + this.c.a(i1, localPathPoint.a(localPathPoint.a, localPathPoint.b + 1, localPathPoint.c)); + if ((localObject != null) && (localPathPoint.b >= ((PathPoint) localObject).b)) { + this.c.a(i1 + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1, + ((PathPoint) localObject).c)); + } + } + } + if (this.pp) { + if (this.b.e(new BlockPosition(MathHelper.floor(this.a.locX), (int) (this.a.getBoundingBox().b + 0.5D), + MathHelper.floor(this.a.locZ)))) { + return; + } + for (int i = 0; i < this.c.d(); i++) { + PathPoint localPathPoint = this.c.a(i); + if (this.b.e(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c))) { + this.c.b(i - 1); + return; + } + } + } + } + + public boolean g() { + return this.o.c(); + } + + public boolean h() { + return this.o.e(); + } + + @Override + public BlockPosition j() { + return this.q; + } + + @Override + public float k() { + return (float) this.p.getValue(); + } + + @Override + public boolean l() { + return this.m; + } + + @Override + public void m() { + if (this.b.getTime() - this.n > 20L) { + if (this.q != null) { + this.c = null; + this.c = b(this.q); + this.n = this.b.getTime(); + this.m = false; + } + } else { + this.m = true; + } + } + + @Override + public PathEntity n() { + return this.c; + } + + @Override + protected void o() { + } + + @Override + protected void p() { + Vec3D localVec3D1 = c(); + + int i1 = this.c.d(); + for (int i2 = this.c.e(); i2 < this.c.d(); i2++) { + if (this.c.a(i2).b != Math.floor(localVec3D1.y)) { + i1 = i2; + break; + } + } + this.l = (this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F); + Vec3D localVec3D2 = this.c.f(); + if ((MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.l) + && (MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.l) + && (Math.abs(this.a.locY - localVec3D2.y) < 1.0D)) { + this.c.c(this.c.e() + 1); + } + int i3 = MathHelper.f(this.a.width); + int i4 = MathHelper.f(this.a.length); + int i5 = i3; + for (int i6 = i1 - 1; i6 >= this.c.e(); i6--) { + if (a(localVec3D1, this.c.a(this.a, i6), i3, i4, i5)) { + this.c.c(i6); + break; + } + } + a(localVec3D1); + } + + @Override + public boolean q() { + return (this.c == null) || (this.c.b()); + } + + @Override + public void r() { + this.c = null; + } + + @Override + protected boolean s() { + return (this.a.aq()) || (this.a.ax()); + } + + public void setRange(float pathfindingRange) { + this.p.setValue(pathfindingRange); + } + + public PathEntity superb(BlockPosition paramBlockPosition) { + if (!b()) { + return null; + } + if ((this.c != null) && (!this.c.b()) && (paramBlockPosition.equals(this.q))) { + return this.c; + } + this.q = paramBlockPosition; + + float f1 = k(); + this.b.methodProfiler.a("pathfind"); + BlockPosition localBlockPosition = new BlockPosition(this.a); + int i1 = (int) (f1 + 8.0F); + + ChunkCache localChunkCache = new ChunkCache(this.b, localBlockPosition.a(-i1, -i1, -i1), + localBlockPosition.a(i1, i1, i1), 0); + PathEntity localPathEntity = this.r.a(localChunkCache, this.a, this.q, f1); + this.b.methodProfiler.e(); + return localPathEntity; + } + + @Override + public PathfinderAbstract t() { + return this.o; + } + + private int u() { + if ((!this.a.isInWater()) || (!h())) { + return (int) (this.a.getBoundingBox().b + 0.5D); + } + int i = (int) this.a.getBoundingBox().b; + Block localBlock = this.b + .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ))).getBlock(); + int j = 0; + while (localBlock == Blocks.WATER) { + i++; + localBlock = this.b + .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ))) + .getBlock(); + j++; + if (j > 16) { + return (int) this.a.getBoundingBox().b; + } + } + return i; + } + + private static EntityInsentient getDummyInsentient(EntityHumanNPC from, World world) { + return new EntityInsentient(EntityTypes.PLAYER, world) { + }; + } +} \ No newline at end of file diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java new file mode 100644 index 000000000..c1e31db67 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java @@ -0,0 +1,152 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.util.Set; + +import com.google.common.collect.Sets; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityInsentient; +import net.minecraft.server.v1_13_R1.IBlockAccess; +import net.minecraft.server.v1_13_R1.Path; +import net.minecraft.server.v1_13_R1.PathEntity; +import net.minecraft.server.v1_13_R1.PathPoint; +import net.minecraft.server.v1_13_R1.Pathfinder; + +public class PlayerPathfinder extends Pathfinder { + private final Path a = new Path(); + private final Set b = Sets.newHashSet(); + private final PathPoint[] c = new PathPoint[32]; + private final PlayerPathfinderNormal d; + + public PlayerPathfinder(PlayerPathfinderNormal paramPathfinderAbstract) { + super(paramPathfinderAbstract); + this.d = paramPathfinderAbstract; + } + + public PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, + BlockPosition paramBlockPosition, float paramFloat) { + return a(paramIBlockAccess, paramEntityInsentient, paramBlockPosition.getX() + 0.5F, + paramBlockPosition.getY() + 0.5F, paramBlockPosition.getZ() + 0.5F, paramFloat); + } + + private PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, double paramDouble1, + double paramDouble2, double paramDouble3, float paramFloat) { + this.a.a(); + this.d.a(paramIBlockAccess, paramEntityInsentient); + PathPoint localPathPoint1 = this.d.b(); + PathPoint localPathPoint2 = this.d.a(paramDouble1, paramDouble2, paramDouble3); + + PathEntity localPathEntity = a(localPathPoint1, localPathPoint2, paramFloat); + + this.d.a(); + return localPathEntity; + } + + public PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, Entity paramEntity, + float paramFloat) { + return a(paramIBlockAccess, paramEntityInsentient, paramEntity.locX, paramEntity.getBoundingBox().b, + paramEntity.locZ, paramFloat); + } + + @Override + public PathEntity a(IBlockAccess paramIBlockAccess, EntityInsentient paramEntityInsentient, + BlockPosition paramBlockPosition, float paramFloat) { + return a(paramIBlockAccess, paramEntityInsentient, paramBlockPosition.getX() + 0.5F, + paramBlockPosition.getY() + 0.5F, paramBlockPosition.getZ() + 0.5F, paramFloat); + } + + private PathEntity a(IBlockAccess paramIBlockAccess, EntityInsentient paramEntityInsentient, double paramDouble1, + double paramDouble2, double paramDouble3, float paramFloat) { + this.a.a(); + this.d.a(paramIBlockAccess, paramEntityInsentient); + PathPoint localPathPoint1 = this.d.b(); + PathPoint localPathPoint2 = this.d.a(paramDouble1, paramDouble2, paramDouble3); + + PathEntity localPathEntity = a(localPathPoint1, localPathPoint2, paramFloat); + + this.d.a(); + return localPathEntity; + } + + @Override + public PathEntity a(IBlockAccess paramIBlockAccess, EntityInsentient paramEntityInsentient, Entity paramEntity, + float paramFloat) { + return a(paramIBlockAccess, paramEntityInsentient, paramEntity.locX, paramEntity.getBoundingBox().b, + paramEntity.locZ, paramFloat); + } + + private PathEntity a(PathPoint paramPathPoint1, PathPoint paramPathPoint2) { + int i = 1; + PathPoint localPathPoint = paramPathPoint2; + while (localPathPoint.h != null) { + i++; + localPathPoint = localPathPoint.h; + } + PathPoint[] arrayOfPathPoint = new PathPoint[i]; + localPathPoint = paramPathPoint2; + arrayOfPathPoint[(--i)] = localPathPoint; + while (localPathPoint.h != null) { + localPathPoint = localPathPoint.h; + arrayOfPathPoint[(--i)] = localPathPoint; + } + return new PathEntity(arrayOfPathPoint); + } + + private PathEntity a(PathPoint paramPathPoint1, PathPoint paramPathPoint2, float paramFloat) { + paramPathPoint1.e = 0.0F; + paramPathPoint1.f = paramPathPoint1.c(paramPathPoint2); + paramPathPoint1.g = paramPathPoint1.f; + + this.a.a(); + this.b.clear(); + this.a.a(paramPathPoint1); + + Object localObject1 = paramPathPoint1; + int i = 0; + while (!this.a.e()) { + i++; + if (i >= 200) { + break; + } + Object localObject2 = this.a.c(); + if (((PathPoint) localObject2).equals(paramPathPoint2)) { + localObject1 = paramPathPoint2; + break; + } + if (((PathPoint) localObject2).c(paramPathPoint2) < ((PathPoint) localObject1).c(paramPathPoint2)) { + localObject1 = localObject2; + } + ((PathPoint) localObject2).i = true; + + int j = this.d.a(this.c, (PathPoint) localObject2, paramPathPoint2, paramFloat); + for (int k = 0; k < j; k++) { + PathPoint localPathPoint = this.c[k]; + + float f1 = ((PathPoint) localObject2).c(localPathPoint); + localPathPoint.j = (((PathPoint) localObject2).j + f1); + localPathPoint.k = (f1 + localPathPoint.l); + + float f2 = ((PathPoint) localObject2).e + localPathPoint.k; + if ((localPathPoint.j < paramFloat) && ((!localPathPoint.a()) || (f2 < localPathPoint.e))) { + localPathPoint.h = ((PathPoint) localObject2); + localPathPoint.e = f2; + localPathPoint.f = (localPathPoint.c(paramPathPoint2) + localPathPoint.l); + if (localPathPoint.a()) { + this.a.a(localPathPoint, localPathPoint.e + localPathPoint.f); + } else { + localPathPoint.g = (localPathPoint.e + localPathPoint.f); + this.a.a(localPathPoint); + } + } + } + } + if (localObject1 == paramPathPoint1) { + return null; + } + Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1); + + return (PathEntity) localObject2; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java new file mode 100644 index 000000000..7e755957c --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java @@ -0,0 +1,77 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.minecraft.server.v1_13_R1.IBlockAccess; +import net.minecraft.server.v1_13_R1.IntHashMap; +import net.minecraft.server.v1_13_R1.MathHelper; +import net.minecraft.server.v1_13_R1.PathPoint; +import net.minecraft.server.v1_13_R1.PathfinderAbstract; + +public abstract class PlayerPathfinderAbstract extends PathfinderAbstract { + protected IBlockAccess a; + protected EntityHumanNPC b; + protected final IntHashMap c = new IntHashMap(); + protected int d; + protected int e; + protected int f; + protected boolean g; + protected boolean h; + protected boolean i; + + @Override + public void a() { + this.a = null; + this.b = null; + } + + @Override + public void a(boolean paramBoolean) { + this.g = paramBoolean; + } + + public void a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient) { + this.a = paramIBlockAccess; + this.b = paramEntityInsentient; + this.c.c(); + + this.d = MathHelper.d(paramEntityInsentient.width + 1.0F); + this.e = MathHelper.d(paramEntityInsentient.length + 1.0F); + this.f = MathHelper.d(paramEntityInsentient.width + 1.0F); + } + + @Override + protected PathPoint a(int paramInt1, int paramInt2, int paramInt3) { + int j = PathPoint.b(paramInt1, paramInt2, paramInt3); + PathPoint localPathPoint = this.c.get(j); + if (localPathPoint == null) { + localPathPoint = new PathPoint(paramInt1, paramInt2, paramInt3); + this.c.a(j, localPathPoint); + } + return localPathPoint; + } + + @Override + public void b(boolean paramBoolean) { + this.h = paramBoolean; + } + + @Override + public boolean c() { + return this.g; + } + + @Override + public void c(boolean paramBoolean) { + this.i = paramBoolean; + } + + @Override + public boolean d() { + return this.h; + } + + @Override + public boolean e() { + return this.i; + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java new file mode 100644 index 000000000..c8b5b723b --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java @@ -0,0 +1,478 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Iterator; + +import com.google.common.collect.Sets; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.minecraft.server.v1_13_R1.AxisAlignedBB; +import net.minecraft.server.v1_13_R1.Block; +import net.minecraft.server.v1_13_R1.BlockCobbleWall; +import net.minecraft.server.v1_13_R1.BlockDoor; +import net.minecraft.server.v1_13_R1.BlockFence; +import net.minecraft.server.v1_13_R1.BlockFenceGate; +import net.minecraft.server.v1_13_R1.BlockMinecartTrackAbstract; +import net.minecraft.server.v1_13_R1.BlockPosition; +import net.minecraft.server.v1_13_R1.BlockPosition.MutableBlockPosition; +import net.minecraft.server.v1_13_R1.Blocks; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityInsentient; +import net.minecraft.server.v1_13_R1.EnumDirection; +import net.minecraft.server.v1_13_R1.EnumDirection.EnumAxis; +import net.minecraft.server.v1_13_R1.Fluid; +import net.minecraft.server.v1_13_R1.IBlockAccess; +import net.minecraft.server.v1_13_R1.IBlockData; +import net.minecraft.server.v1_13_R1.Material; +import net.minecraft.server.v1_13_R1.MathHelper; +import net.minecraft.server.v1_13_R1.PathMode; +import net.minecraft.server.v1_13_R1.PathPoint; +import net.minecraft.server.v1_13_R1.PathType; +import net.minecraft.server.v1_13_R1.TagsFluid; +import net.minecraft.server.v1_13_R1.VoxelShape; + +public class PlayerPathfinderNormal extends PlayerPathfinderAbstract { + protected float j; + + @Override + public void a() { + this.b.a(PathType.WATER, this.j); + super.a(); + } + + @Override + public PathPoint a(double var1, double var3, double var5) { + return this.a(MathHelper.floor(var1), MathHelper.floor(var3), MathHelper.floor(var5)); + } + + private PathType a(EntityHumanNPC var1, BlockPosition var2) { + return this.a(var1, var2.getX(), var2.getY(), var2.getZ()); + } + + private PathType a(EntityHumanNPC var1, int var2, int var3, int var4) { + return this.a(this.a, var2, var3, var4, var1, this.d, this.e, this.f, this.d(), this.c()); + } + + @Override + public void a(IBlockAccess var1, EntityHumanNPC var2) { + super.a(var1, var2); + this.j = var2.a(PathType.WATER); + } + + @Override + public PathType a(IBlockAccess var1, int var2, int var3, int var4) { + PathType var5 = this.b(var1, var2, var3, var4); + if (var5 == PathType.OPEN && var3 >= 1) { + Block var6 = var1.getType(new BlockPosition(var2, var3 - 1, var4)).getBlock(); + PathType var7 = this.b(var1, var2, var3 - 1, var4); + var5 = var7 != PathType.WALKABLE && var7 != PathType.OPEN && var7 != PathType.WATER && var7 != PathType.LAVA + ? PathType.WALKABLE + : PathType.OPEN; + if (var7 == PathType.DAMAGE_FIRE || var6 == Blocks.MAGMA_BLOCK) { + var5 = PathType.DAMAGE_FIRE; + } + + if (var7 == PathType.DAMAGE_CACTUS) { + var5 = PathType.DAMAGE_CACTUS; + } + } + + var5 = this.a(var1, var2, var3, var4, var5); + return var5; + } + + public PathType a(IBlockAccess var1, int var2, int var3, int var4, EntityHumanNPC var5, int var6, int var7, + int var8, boolean var9, boolean var10) { + EnumSet var11 = EnumSet.noneOf(PathType.class); + PathType var12 = PathType.BLOCKED; + double var13 = var5.width / 2.0D; + BlockPosition var15 = new BlockPosition(var5); + var12 = this.a(var1, var2, var3, var4, var6, var7, var8, var9, var10, var11, var12, var15); + if (var11.contains(PathType.FENCE)) { + return PathType.FENCE; + } else { + PathType var16 = PathType.BLOCKED; + Iterator var17 = var11.iterator(); + + while (var17.hasNext()) { + PathType var18 = (PathType) var17.next(); + if (var5.a(var18) < 0.0F) { + return var18; + } + + if (var5.a(var18) >= var5.a(var16)) { + var16 = var18; + } + } + + if (var12 == PathType.OPEN && var5.a(var16) == 0.0F) { + return PathType.OPEN; + } else { + return var16; + } + } + } + + @Override + public PathType a(IBlockAccess var1, int var2, int var3, int var4, EntityInsentient var5, int var6, int var7, + int var8, boolean var9, boolean var10) { + EnumSet var11 = EnumSet.noneOf(PathType.class); + PathType var12 = PathType.BLOCKED; + double var13 = var5.width / 2.0D; + BlockPosition var15 = new BlockPosition(var5); + var12 = this.a(var1, var2, var3, var4, var6, var7, var8, var9, var10, var11, var12, var15); + if (var11.contains(PathType.FENCE)) { + return PathType.FENCE; + } else { + PathType var16 = PathType.BLOCKED; + Iterator var17 = var11.iterator(); + + while (var17.hasNext()) { + PathType var18 = (PathType) var17.next(); + if (var5.a(var18) < 0.0F) { + return var18; + } + + if (var5.a(var18) >= var5.a(var16)) { + var16 = var18; + } + } + + if (var12 == PathType.OPEN && var5.a(var16) == 0.0F) { + return PathType.OPEN; + } else { + return var16; + } + } + } + + public PathType a(IBlockAccess var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, + boolean var9, EnumSet var10, PathType var11, BlockPosition var12) { + for (int var13 = 0; var13 < var5; ++var13) { + for (int var14 = 0; var14 < var6; ++var14) { + for (int var15 = 0; var15 < var7; ++var15) { + int var16 = var13 + var2; + int var17 = var14 + var3; + int var18 = var15 + var4; + PathType var19 = this.a(var1, var16, var17, var18); + if (var19 == PathType.DOOR_WOOD_CLOSED && var8 && var9) { + var19 = PathType.WALKABLE; + } + + if (var19 == PathType.DOOR_OPEN && !var9) { + var19 = PathType.BLOCKED; + } + + if (var19 == PathType.RAIL + && !(var1.getType(var12).getBlock() instanceof BlockMinecartTrackAbstract) + && !(var1.getType(var12.down()).getBlock() instanceof BlockMinecartTrackAbstract)) { + var19 = PathType.FENCE; + } + + if (var13 == 0 && var14 == 0 && var15 == 0) { + var11 = var19; + } + + var10.add(var19); + } + } + } + + return var11; + } + + public PathType a(IBlockAccess var1, int var2, int var3, int var4, PathType var5) { + if (var5 == PathType.WALKABLE) { + BlockPosition.b var6 = BlockPosition.b.r(); + Throwable var7 = null; + + try { + for (int var8 = -1; var8 <= 1; ++var8) { + for (int var9 = -1; var9 <= 1; ++var9) { + if (var8 != 0 || var9 != 0) { + Block var10 = var1.getType(var6.f(var8 + var2, var3, var9 + var4)).getBlock(); + if (var10 == Blocks.CACTUS) { + var5 = PathType.DANGER_CACTUS; + } else if (var10 == Blocks.FIRE) { + var5 = PathType.DANGER_FIRE; + } + } + } + } + } catch (Throwable var18) { + var7 = var18; + throw var18; + } finally { + if (var6 != null) { + if (var7 != null) { + try { + var6.close(); + } catch (Throwable var17) { + var7.addSuppressed(var17); + } + } else { + var6.close(); + } + } + + } + } + + return var5; + } + + private PathPoint a(int var1, int var2, int var3, int var4, double var5, EnumDirection var7) { + PathPoint var8 = null; + BlockPosition var9 = new BlockPosition(var1, var2, var3); + double var10 = a(this.a, var9); + if (var10 - var5 > 1.125D) { + return null; + } else { + PathType var12 = this.a(this.b, var1, var2, var3); + float var13 = this.b.a(var12); + double var14 = this.b.width / 2.0D; + if (var13 >= 0.0F) { + var8 = this.a(var1, var2, var3); + var8.m = var12; + var8.l = Math.max(var8.l, var13); + } + + if (var12 == PathType.WALKABLE) { + return var8; + } else { + if (var8 == null && var4 > 0 && var12 != PathType.FENCE && var12 != PathType.TRAPDOOR) { + var8 = this.a(var1, var2 + 1, var3, var4 - 1, var5, var7); + if (var8 != null && (var8.m == PathType.OPEN || var8.m == PathType.WALKABLE) + && this.b.width < 1.0F) { + double var16 = var1 - var7.getAdjacentX() + 0.5D; + double var18 = var3 - var7.getAdjacentZ() + 0.5D; + AxisAlignedBB var20 = new AxisAlignedBB(var16 - var14, var2 + 0.001D, var18 - var14, + var16 + var14, this.b.length + a(this.a, var9.up()) - 0.002D, var18 + var14); + if (!this.b.world.getCubes((Entity) null, var20)) { + var8 = null; + } + } + } + + if (var12 == PathType.WATER && !this.e()) { + if (this.a(this.b, var1, var2 - 1, var3) != PathType.WATER) { + return var8; + } + + while (var2 > 0) { + --var2; + var12 = this.a(this.b, var1, var2, var3); + if (var12 != PathType.WATER) { + return var8; + } + + var8 = this.a(var1, var2, var3); + var8.m = var12; + var8.l = Math.max(var8.l, this.b.a(var12)); + } + } + + if (var12 == PathType.OPEN) { + AxisAlignedBB var21 = new AxisAlignedBB(var1 - var14 + 0.5D, var2 + 0.001D, var3 - var14 + 0.5D, + var1 + var14 + 0.5D, var2 + this.b.length, var3 + var14 + 0.5D); + if (!this.b.world.getCubes((Entity) null, var21)) { + return null; + } + + if (this.b.width >= 1.0F) { + PathType var17 = this.a(this.b, var1, var2 - 1, var3); + if (var17 == PathType.BLOCKED) { + var8 = this.a(var1, var2, var3); + var8.m = PathType.WALKABLE; + var8.l = Math.max(var8.l, var13); + return var8; + } + } + + int var22 = 0; + + while (var2 > 0 && var12 == PathType.OPEN) { + --var2; + if (var22++ >= this.b.bn()) { + return null; + } + + var12 = this.a(this.b, var1, var2, var3); + var13 = this.b.a(var12); + if (var12 != PathType.OPEN && var13 >= 0.0F) { + var8 = this.a(var1, var2, var3); + var8.m = var12; + var8.l = Math.max(var8.l, var13); + break; + } + + if (var13 < 0.0F) { + return null; + } + } + } + + return var8; + } + } + } + + @Override + public int a(PathPoint[] var1, PathPoint var2, PathPoint var3, float var4) { + int var5 = 0; + int var6 = 0; + PathType var7 = this.a(this.b, var2.a, var2.b + 1, var2.c); + if (this.b.a(var7) >= 0.0F) { + var6 = MathHelper.d(Math.max(1.0F, this.b.Q)); + } + + double var8 = a(this.a, new BlockPosition(var2.a, var2.b, var2.c)); + PathPoint var10 = this.a(var2.a, var2.b, var2.c + 1, var6, var8, EnumDirection.SOUTH); + PathPoint var11 = this.a(var2.a - 1, var2.b, var2.c, var6, var8, EnumDirection.WEST); + PathPoint var12 = this.a(var2.a + 1, var2.b, var2.c, var6, var8, EnumDirection.EAST); + PathPoint var13 = this.a(var2.a, var2.b, var2.c - 1, var6, var8, EnumDirection.NORTH); + if (var10 != null && !var10.i && var10.a(var3) < var4) { + var1[var5++] = var10; + } + + if (var11 != null && !var11.i && var11.a(var3) < var4) { + var1[var5++] = var11; + } + + if (var12 != null && !var12.i && var12.a(var3) < var4) { + var1[var5++] = var12; + } + + if (var13 != null && !var13.i && var13.a(var3) < var4) { + var1[var5++] = var13; + } + + boolean var14 = var13 == null || var13.m == PathType.OPEN || var13.l != 0.0F; + boolean var15 = var10 == null || var10.m == PathType.OPEN || var10.l != 0.0F; + boolean var16 = var12 == null || var12.m == PathType.OPEN || var12.l != 0.0F; + boolean var17 = var11 == null || var11.m == PathType.OPEN || var11.l != 0.0F; + PathPoint var18; + if (var14 && var17) { + var18 = this.a(var2.a - 1, var2.b, var2.c - 1, var6, var8, EnumDirection.NORTH); + if (var18 != null && !var18.i && var18.a(var3) < var4) { + var1[var5++] = var18; + } + } + + if (var14 && var16) { + var18 = this.a(var2.a + 1, var2.b, var2.c - 1, var6, var8, EnumDirection.NORTH); + if (var18 != null && !var18.i && var18.a(var3) < var4) { + var1[var5++] = var18; + } + } + + if (var15 && var17) { + var18 = this.a(var2.a - 1, var2.b, var2.c + 1, var6, var8, EnumDirection.SOUTH); + if (var18 != null && !var18.i && var18.a(var3) < var4) { + var1[var5++] = var18; + } + } + + if (var15 && var16) { + var18 = this.a(var2.a + 1, var2.b, var2.c + 1, var6, var8, EnumDirection.SOUTH); + if (var18 != null && !var18.i && var18.a(var3) < var4) { + var1[var5++] = var18; + } + } + + return var5; + } + + @Override + public PathPoint b() { + int var1; + BlockPosition var2; + if (this.e() && this.b.isInWater()) { + var1 = (int) this.b.getBoundingBox().b; + MutableBlockPosition var8 = new MutableBlockPosition(MathHelper.floor(this.b.locX), var1, + MathHelper.floor(this.b.locZ)); + + for (Block var3 = this.a.getType(var8).getBlock(); var3 == Blocks.WATER; var3 = this.a.getType(var8) + .getBlock()) { + ++var1; + var8.c(MathHelper.floor(this.b.locX), var1, MathHelper.floor(this.b.locZ)); + } + } else if (this.b.onGround) { + var1 = MathHelper.floor(this.b.getBoundingBox().b + 0.5D); + } else { + for (var2 = new BlockPosition( + this.b); (this.a.getType(var2).isAir() || this.a.getType(var2).a(this.a, var2, PathMode.LAND)) + && var2.getY() > 0; var2 = var2.down()) { + ; + } + + var1 = var2.up().getY(); + } + + var2 = new BlockPosition(this.b); + PathType var9 = this.a(this.b, var2.getX(), var1, var2.getZ()); + if (this.b.a(var9) < 0.0F) { + HashSet var4 = Sets.newHashSet(); + var4.add(new BlockPosition(this.b.getBoundingBox().a, var1, this.b.getBoundingBox().c)); + var4.add(new BlockPosition(this.b.getBoundingBox().a, var1, this.b.getBoundingBox().f)); + var4.add(new BlockPosition(this.b.getBoundingBox().d, var1, this.b.getBoundingBox().c)); + var4.add(new BlockPosition(this.b.getBoundingBox().d, var1, this.b.getBoundingBox().f)); + Iterator var5 = var4.iterator(); + + while (var5.hasNext()) { + BlockPosition var6 = (BlockPosition) var5.next(); + PathType var7 = this.a(this.b, var6); + if (this.b.a(var7) >= 0.0F) { + return this.a(var6.getX(), var6.getY(), var6.getZ()); + } + } + } + + return this.a(var2.getX(), var1, var2.getZ()); + } + + protected PathType b(IBlockAccess var1, int var2, int var3, int var4) { + BlockPosition var5 = new BlockPosition(var2, var3, var4); + IBlockData var6 = var1.getType(var5); + Block var7 = var6.getBlock(); + Material var8 = var6.getMaterial(); + if (var6.isAir()) { + return PathType.OPEN; + } else if (var7 != Blocks.OAK_TRAPDOOR && var7 != Blocks.IRON_TRAPDOOR && var7 != Blocks.LILY_PAD) { + if (var7 == Blocks.FIRE) { + return PathType.DAMAGE_FIRE; + } else if (var7 == Blocks.CACTUS) { + return PathType.DAMAGE_CACTUS; + } else if (var7 instanceof BlockDoor && var8 == Material.WOOD && !var6.get(BlockDoor.OPEN).booleanValue()) { + return PathType.DOOR_WOOD_CLOSED; + } else if (var7 instanceof BlockDoor && var8 == Material.ORE && !var6.get(BlockDoor.OPEN).booleanValue()) { + return PathType.DOOR_IRON_CLOSED; + } else if (var7 instanceof BlockDoor && var6.get(BlockDoor.OPEN).booleanValue()) { + return PathType.DOOR_OPEN; + } else if (var7 instanceof BlockMinecartTrackAbstract) { + return PathType.RAIL; + } else if (var7 instanceof BlockFence || var7 instanceof BlockCobbleWall + || var7 instanceof BlockFenceGate && !var6.get(BlockFenceGate.OPEN).booleanValue()) { + return PathType.FENCE; + } else { + Fluid var9 = var1.b(var5); + if (var9.a(TagsFluid.a)) { + return PathType.WATER; + } else if (var9.a(TagsFluid.b)) { + return PathType.LAVA; + } else { + return var6.a(var1, var5, PathMode.LAND) ? PathType.OPEN : PathType.BLOCKED; + } + } + } else { + return PathType.TRAPDOOR; + } + } + + public static double a(IBlockAccess var0, BlockPosition var1) { + BlockPosition var2 = var1.down(); + VoxelShape var3 = var0.getType(var2).h(var0, var2); + return var2.getY() + (var3.b() ? 0.0D : var3.c(EnumAxis.Y)); + } +} diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java new file mode 100644 index 000000000..5307cda62 --- /dev/null +++ b/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java @@ -0,0 +1,107 @@ +package net.citizensnpcs.nms.v1_13_R1.util; + +import java.lang.reflect.Field; + +import org.bukkit.entity.Player; + +import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC; +import net.citizensnpcs.npc.skin.SkinnableEntity; +import net.citizensnpcs.util.NMS; +import net.minecraft.server.v1_13_R1.Entity; +import net.minecraft.server.v1_13_R1.EntityPlayer; +import net.minecraft.server.v1_13_R1.EntityTrackerEntry; + +public class PlayerlistTrackerEntry extends EntityTrackerEntry { + public PlayerlistTrackerEntry(Entity entity, int i, int j, int k, boolean flag) { + super(entity, i, j, k, flag); + } + + public PlayerlistTrackerEntry(EntityTrackerEntry entry) { + this(getTracker(entry), getE(entry), getF(entry), getG(entry), getU(entry)); + } + + @Override + public void updatePlayer(final EntityPlayer entityplayer) { + // prevent updates to NPC "viewers" + if (entityplayer instanceof EntityHumanNPC) + return; + Entity tracker = getTracker(this); + if (entityplayer != tracker && c(entityplayer)) { + if (!this.trackedPlayers.contains(entityplayer) + && ((entityplayer.getWorldServer().getPlayerChunkMap().a(entityplayer, tracker.ae, tracker.ag)) + || (tracker.attachedToPlayer))) { + if ((tracker instanceof SkinnableEntity)) { + SkinnableEntity skinnable = (SkinnableEntity) tracker; + + Player player = skinnable.getBukkitEntity(); + if (!entityplayer.getBukkitEntity().canSee(player)) + return; + + skinnable.getSkinTracker().updateViewer(entityplayer.getBukkitEntity()); + } + } + } + super.updatePlayer(entityplayer); + } + + private static int getE(EntityTrackerEntry entry) { + try { + return (Integer) E.get(entry); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return 0; + } + + private static int getF(EntityTrackerEntry entry) { + try { + return (Integer) F.get(entry); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return 0; + } + + private static int getG(EntityTrackerEntry entry) { + try { + return (Integer) G.get(entry); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return 0; + } + + private static Entity getTracker(EntityTrackerEntry entry) { + try { + return (Entity) TRACKER.get(entry); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return null; + } + + private static boolean getU(EntityTrackerEntry entry) { + try { + return (Boolean) U.get(entry); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return false; + } + + private static Field E = NMS.getField(EntityTrackerEntry.class, "e"); + private static Field F = NMS.getField(EntityTrackerEntry.class, "f"); + private static Field G = NMS.getField(EntityTrackerEntry.class, "g"); + private static Field TRACKER = NMS.getField(EntityTrackerEntry.class, "tracker"); + private static Field U = NMS.getField(EntityTrackerEntry.class, "u"); +} diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index 21c523afa..3a4182dde 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -5,7 +5,7 @@ net.citizensnpcs citizens-parent - 2.0.22-SNAPSHOT + 2.0.23-SNAPSHOT citizens-v1_8_R3 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 f70616050..fd72db154 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 @@ -62,13 +62,13 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable private PlayerControllerJump controllerJump; private PlayerControllerLook controllerLook; private PlayerControllerMove controllerMove; + private boolean isTracked = false; private int jumpTicks = 0; private PlayerNavigation navigation; private final CitizensNPC npc; private final Location packetLocationCache = new Location(null, 0, 0, 0); private final SkinPacketTracker skinTracker; private int updateCounter = 0; - private boolean isTracked = false; public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile, PlayerInteractManager playerInteractManager, NPC npc) { @@ -84,8 +84,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } } - public void setTracked() { - isTracked = true; + @Override + protected void a(double d0, boolean flag, Block block, BlockPosition blockposition) { + if (npc == null || !npc.isFlyable()) { + super.a(d0, flag, block, blockposition); + } } @Override @@ -96,13 +99,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable return super.a(entityplayer); } - @Override - protected void a(double d0, boolean flag, Block block, BlockPosition blockposition) { - if (npc == null || !npc.isFlyable()) { - super.a(d0, flag, block, blockposition); - } - } - @Override public boolean ae() { return npc == null ? super.ae() : npc.data().get(NPC.COLLIDABLE_METADATA, true); @@ -284,6 +280,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } public void livingEntityBaseTick() { + if (!this.world.isClientSide) { + b(0, this.fireTicks > 0); + } this.ay = this.az; this.aE = this.aF; if (this.hurtTicks > 0) { @@ -365,6 +364,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable controllerLook.a(target.getX(), target.getY(), target.getZ(), 10, 40); } + public void setTracked() { + isTracked = true; + } + @Override public void t_() { super.t_(); @@ -505,6 +508,5 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } private static final float EPSILON = 0.005F; - private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0); }