From 139158cb482bc656e2f5962d9d27c8d6ad9c4d60 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 8 Dec 2022 23:21:09 +0800 Subject: [PATCH] Initial update to 1.19.3 --- dist/pom.xml | 2 +- .../npc/ai/CitizensNavigator.java | 5 + .../npc/skin/SkinPacketTracker.java | 39 +-- .../citizensnpcs/npc/skin/TabListRemover.java | 2 +- .../main/java/net/citizensnpcs/util/NMS.java | 4 +- .../java/net/citizensnpcs/util/NMSBridge.java | 2 +- pom.xml | 2 +- .../nms/v1_10_R1/util/NMSImpl.java | 3 +- .../nms/v1_11_R1/util/NMSImpl.java | 3 +- .../nms/v1_12_R1/util/NMSImpl.java | 3 +- .../nms/v1_13_R2/util/NMSImpl.java | 3 +- .../nms/v1_14_R1/util/NMSImpl.java | 3 +- .../nms/v1_15_R1/util/NMSImpl.java | 3 +- .../nms/v1_16_R3/util/NMSImpl.java | 3 +- .../nms/v1_17_R1/util/NMSImpl.java | 3 +- .../nms/v1_18_R2/util/NMSImpl.java | 3 +- {v1_19_R1 => v1_19_R2}/pom.xml | 4 +- .../nms/v1_19_R2}/entity/AllayController.java | 12 +- .../v1_19_R2}/entity/AxolotlController.java | 12 +- .../nms/v1_19_R2}/entity/BatController.java | 12 +- .../nms/v1_19_R2}/entity/BeeController.java | 12 +- .../nms/v1_19_R2}/entity/BlazeController.java | 12 +- .../nms/v1_19_R2}/entity/CatController.java | 12 +- .../entity/CaveSpiderController.java | 12 +- .../v1_19_R2}/entity/ChickenController.java | 12 +- .../nms/v1_19_R2}/entity/CodController.java | 14 +- .../nms/v1_19_R2}/entity/CowController.java | 12 +- .../v1_19_R2}/entity/CreeperController.java | 12 +- .../v1_19_R2}/entity/DolphinController.java | 12 +- .../v1_19_R2}/entity/DrownedController.java | 12 +- .../entity/EnderDragonController.java | 12 +- .../v1_19_R2}/entity/EndermanController.java | 12 +- .../v1_19_R2}/entity/EndermiteController.java | 12 +- .../nms/v1_19_R2}/entity/EntityHumanNPC.java | 33 +- .../v1_19_R2}/entity/EvokerController.java | 12 +- .../nms/v1_19_R2}/entity/FoxController.java | 12 +- .../nms/v1_19_R2}/entity/FrogController.java | 12 +- .../nms/v1_19_R2}/entity/GhastController.java | 12 +- .../nms/v1_19_R2}/entity/GiantController.java | 12 +- .../v1_19_R2}/entity/GlowSquidController.java | 12 +- .../nms/v1_19_R2}/entity/GoatController.java | 12 +- .../v1_19_R2}/entity/GuardianController.java | 12 +- .../entity/GuardianElderController.java | 12 +- .../v1_19_R2}/entity/HoglinController.java | 12 +- .../nms/v1_19_R2}/entity/HorseController.java | 12 +- .../entity/HorseDonkeyController.java | 12 +- .../v1_19_R2}/entity/HorseMuleController.java | 12 +- .../entity/HorseSkeletonController.java | 12 +- .../entity/HorseZombieController.java | 12 +- .../nms/v1_19_R2}/entity/HumanController.java | 6 +- .../entity/IllusionerController.java | 12 +- .../v1_19_R2}/entity/IronGolemController.java | 12 +- .../nms/v1_19_R2}/entity/LlamaController.java | 12 +- .../v1_19_R2}/entity/MagmaCubeController.java | 14 +- .../v1_19_R2}/entity/MobEntityController.java | 6 +- .../entity/MushroomCowController.java | 12 +- .../v1_19_R2}/entity/OcelotController.java | 12 +- .../nms/v1_19_R2}/entity/PandaController.java | 12 +- .../v1_19_R2}/entity/ParrotController.java | 12 +- .../v1_19_R2}/entity/PhantomController.java | 14 +- .../nms/v1_19_R2}/entity/PigController.java | 12 +- .../v1_19_R2}/entity/PigZombieController.java | 12 +- .../entity/PiglinBruteController.java | 12 +- .../v1_19_R2}/entity/PiglinController.java | 12 +- .../v1_19_R2}/entity/PillagerController.java | 12 +- .../v1_19_R2}/entity/PolarBearController.java | 12 +- .../entity/PufferFishController.java | 14 +- .../v1_19_R2}/entity/RabbitController.java | 18 +- .../v1_19_R2}/entity/RavagerController.java | 12 +- .../v1_19_R2}/entity/SalmonController.java | 14 +- .../nms/v1_19_R2}/entity/SheepController.java | 12 +- .../v1_19_R2}/entity/ShulkerController.java | 12 +- .../entity/SilverfishController.java | 12 +- .../v1_19_R2}/entity/SkeletonController.java | 12 +- .../entity/SkeletonStrayController.java | 12 +- .../entity/SkeletonWitherController.java | 12 +- .../nms/v1_19_R2}/entity/SlimeController.java | 14 +- .../v1_19_R2}/entity/SnowmanController.java | 12 +- .../v1_19_R2}/entity/SpiderController.java | 12 +- .../nms/v1_19_R2}/entity/SquidController.java | 12 +- .../v1_19_R2}/entity/StriderController.java | 12 +- .../v1_19_R2}/entity/TadpoleController.java | 14 +- .../entity/TraderLlamaController.java | 12 +- .../entity/TropicalFishController.java | 14 +- .../v1_19_R2}/entity/TurtleController.java | 14 +- .../nms/v1_19_R2}/entity/VexController.java | 12 +- .../v1_19_R2}/entity/VillagerController.java | 12 +- .../entity/VindicatorController.java | 12 +- .../entity/WanderingTraderController.java | 12 +- .../v1_19_R2}/entity/WardenController.java | 12 +- .../nms/v1_19_R2}/entity/WitchController.java | 12 +- .../v1_19_R2}/entity/WitherController.java | 12 +- .../nms/v1_19_R2}/entity/WolfController.java | 12 +- .../v1_19_R2}/entity/ZoglinController.java | 12 +- .../v1_19_R2}/entity/ZombieController.java | 12 +- .../entity/ZombieHuskController.java | 12 +- .../entity/ZombieVillagerController.java | 12 +- .../nonliving/AreaEffectCloudController.java | 14 +- .../nonliving/ArmorStandController.java | 14 +- .../entity/nonliving/BoatController.java | 14 +- .../entity/nonliving/ChestBoatController.java | 14 +- .../nonliving/DragonFireballController.java | 14 +- .../entity/nonliving/EggController.java | 14 +- .../nonliving/EnderCrystalController.java | 14 +- .../nonliving/EnderPearlController.java | 14 +- .../nonliving/EnderSignalController.java | 14 +- .../nonliving/EvokerFangsController.java | 14 +- .../nonliving/ExperienceOrbController.java | 14 +- .../nonliving/FallingBlockController.java | 14 +- .../entity/nonliving/FireworkController.java | 14 +- .../nonliving/FishingHookController.java | 16 +- .../nonliving/GlowItemFrameController.java | 14 +- .../entity/nonliving/ItemController.java | 14 +- .../entity/nonliving/ItemFrameController.java | 12 +- .../nonliving/LargeFireballController.java | 14 +- .../entity/nonliving/LeashController.java | 14 +- .../entity/nonliving/LlamaSpitController.java | 14 +- .../entity/nonliving/MarkerController.java | 14 +- .../nonliving/MinecartChestController.java | 14 +- .../nonliving/MinecartCommandController.java | 14 +- .../nonliving/MinecartFurnaceController.java | 14 +- .../nonliving/MinecartHopperController.java | 6 +- .../nonliving/MinecartRideableController.java | 14 +- .../nonliving/MinecartSpawnerController.java | 6 +- .../nonliving/MinecartTNTController.java | 6 +- .../entity/nonliving/PaintingController.java | 14 +- .../nonliving/ShulkerBulletController.java | 14 +- .../nonliving/SmallFireballController.java | 14 +- .../entity/nonliving/SnowballController.java | 14 +- .../nonliving/SpectralArrowController.java | 14 +- .../entity/nonliving/TNTPrimedController.java | 14 +- .../nonliving/ThrownExpBottleController.java | 14 +- .../nonliving/ThrownPotionController.java | 14 +- .../nonliving/ThrownTridentController.java | 14 +- .../nonliving/TippedArrowController.java | 14 +- .../nonliving/WitherSkullController.java | 14 +- .../v1_19_R2}/network/EmptyNetHandler.java | 2 +- .../network/EmptyNetworkManager.java | 4 +- .../v1_19_R2}/util/CitizensBlockBreaker.java | 4 +- .../v1_19_R2}/util/CustomEntityRegistry.java | 19 +- .../util/EmptyAdvancementDataPlayer.java | 2 +- .../util/EmptyServerStatsCounter.java | 2 +- .../v1_19_R2}/util/ForwardingNPCHolder.java | 2 +- .../nms/v1_19_R2}/util/NMSBoundingBox.java | 2 +- .../nms/v1_19_R2}/util/NMSImpl.java | 313 ++++++++++-------- .../v1_19_R2}/util/PlayerAnimationImpl.java | 12 +- .../v1_19_R2}/util/PlayerControllerJump.java | 4 +- .../nms/v1_19_R2}/util/PlayerMoveControl.java | 4 +- .../nms/v1_19_R2}/util/PlayerNavigation.java | 4 +- .../v1_19_R2}/util/PlayerNodeEvaluator.java | 4 +- .../util/PlayerNodeEvaluatorBase.java | 4 +- .../nms/v1_19_R2}/util/PlayerPathfinder.java | 4 +- .../nms/v1_19_R2}/util/PlayerlistTracker.java | 10 +- .../nms/v1_8_R3/util/NMSImpl.java | 3 +- 154 files changed, 1006 insertions(+), 995 deletions(-) rename {v1_19_R1 => v1_19_R2}/pom.xml (97%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/AllayController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/AxolotlController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/BatController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/BeeController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/BlazeController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/CatController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/CaveSpiderController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ChickenController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/CodController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/CowController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/CreeperController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/DolphinController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/DrownedController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/EnderDragonController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/EndermanController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/EndermiteController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/EntityHumanNPC.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/EvokerController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/FoxController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/FrogController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/GhastController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/GiantController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/GlowSquidController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/GoatController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/GuardianController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/GuardianElderController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HoglinController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HorseController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HorseDonkeyController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HorseMuleController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HorseSkeletonController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HorseZombieController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/HumanController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/IllusionerController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/IronGolemController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/LlamaController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/MagmaCubeController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/MobEntityController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/MushroomCowController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/OcelotController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PandaController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ParrotController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PhantomController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PigController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PigZombieController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PiglinBruteController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PiglinController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PillagerController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PolarBearController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/PufferFishController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/RabbitController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/RavagerController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SalmonController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SheepController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ShulkerController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SilverfishController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SkeletonController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SkeletonStrayController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SkeletonWitherController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SlimeController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SnowmanController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SpiderController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/SquidController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/StriderController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/TadpoleController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/TraderLlamaController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/TropicalFishController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/TurtleController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/VexController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/VillagerController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/VindicatorController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/WanderingTraderController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/WardenController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/WitchController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/WitherController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/WolfController.java (96%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ZoglinController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ZombieController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ZombieHuskController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/ZombieVillagerController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/AreaEffectCloudController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ArmorStandController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/BoatController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ChestBoatController.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/DragonFireballController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/EggController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/EnderCrystalController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/EnderPearlController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/EnderSignalController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/EvokerFangsController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ExperienceOrbController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/FallingBlockController.java (92%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/FireworkController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/FishingHookController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/GlowItemFrameController.java (92%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ItemController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ItemFrameController.java (92%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/LargeFireballController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/LeashController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/LlamaSpitController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MarkerController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartChestController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartCommandController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartFurnaceController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartHopperController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartRideableController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartSpawnerController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/MinecartTNTController.java (94%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/PaintingController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ShulkerBulletController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/SmallFireballController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/SnowballController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/SpectralArrowController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/TNTPrimedController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ThrownExpBottleController.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ThrownPotionController.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/ThrownTridentController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/TippedArrowController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/entity/nonliving/WitherSkullController.java (89%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/network/EmptyNetHandler.java (92%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/network/EmptyNetworkManager.java (85%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/CitizensBlockBreaker.java (97%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/CustomEntityRegistry.java (97%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/EmptyAdvancementDataPlayer.java (98%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/EmptyServerStatsCounter.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/ForwardingNPCHolder.java (93%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/NMSBoundingBox.java (91%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/NMSImpl.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerAnimationImpl.java (90%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerControllerJump.java (77%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerMoveControl.java (97%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerNavigation.java (99%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerNodeEvaluator.java (99%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerNodeEvaluatorBase.java (95%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerPathfinder.java (98%) rename {v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1 => v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2}/util/PlayerlistTracker.java (89%) diff --git a/dist/pom.xml b/dist/pom.xml index b5d47768a..43c9a073c 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -92,7 +92,7 @@ ${project.groupId} - citizens-v1_19_R1 + citizens-v1_19_R2 ${project.version} jar compile diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java index 52cce56cc..770f0526d 100644 --- a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java +++ b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java @@ -76,6 +76,11 @@ public class CitizensNavigator implements Navigator, Runnable { stopNavigating(CancelReason.PLUGIN); } + @Override + public void cancelNavigation(CancelReason reason) { + stopNavigating(reason); + } + @Override public NavigatorParameters getDefaultParameters() { return defaultParams; diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java b/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java index 2adbc31c8..c96ad93ee 100644 --- a/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java +++ b/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java @@ -139,23 +139,15 @@ public class SkinPacketTracker { } private void scheduleRemovePacket(final PlayerEntry entry) { - if (isRemoved || !CitizensAPI.hasImplementation() || !CitizensAPI.getPlugin().isEnabled()) + if (isRemoved || !CitizensAPI.hasImplementation() || !CitizensAPI.getPlugin().isEnabled() + || !shouldRemoveFromTabList()) return; - entry.removeTask = Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() { - @Override - public void run() { - if (shouldRemoveFromTabList()) { - TAB_LIST_REMOVER.sendPacket(entry.player, entity); - } - } - }, PACKET_DELAY_REMOVE); + entry.removeTask = Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), + () -> TAB_LIST_REMOVER.sendPacket(entry.player, entity), PACKET_DELAY_REMOVE); } private void scheduleRemovePacket(PlayerEntry entry, int count) { - if (!shouldRemoveFromTabList()) - return; - entry.removeCount = count; scheduleRemovePacket(entry); } @@ -171,22 +163,13 @@ public class SkinPacketTracker { * The radius. */ public void updateNearbyViewers(double radius) { - org.bukkit.World world = entity.getBukkitEntity().getWorld(); Player from = entity.getBukkitEntity(); - Location location = from.getLocation(); - - for (Player player : world.getPlayers()) { - if (player == null || player.hasMetadata("NPC")) - continue; - - if (!location.getWorld().equals(player.getLocation(CACHE_LOCATION).getWorld()) || !player.canSee(from)) - continue; - - if (location.distance(CACHE_LOCATION) > radius) - continue; + CitizensAPI.getLocationLookup().getNearbyPlayers(from.getLocation(CACHE_LOCATION), radius).forEach(player -> { + if (!player.canSee(from) || player.hasMetadata("NPC")) + return; updateViewer(player); - } + }); } /** @@ -212,9 +195,9 @@ public class SkinPacketTracker { inProgress.put(player.getUniqueId(), entry); skin.apply(entity); - NMS.sendTabListAdd(player, entity.getBukkitEntity()); - - scheduleRemovePacket(entry, 2); + if (NMS.sendTabListAdd(player, entity.getBukkitEntity())) { + scheduleRemovePacket(entry, 2); + } } private class PlayerEntry { diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java index dc6055a7f..7eb70eafe 100644 --- a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java +++ b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java @@ -105,7 +105,7 @@ public class TabListRemover { private class PlayerEntry { Player player; - Set toRemove = new HashSet(30); + Set toRemove = new HashSet(20); PlayerEntry(Player player) { this.player = player; diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index 14ebca58a..f6498b217 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -508,8 +508,8 @@ public class NMS { BRIDGE.sendRotationNearby(entity, bodyYaw, headYaw, pitch); } - public static void sendTabListAdd(Player recipient, Player listPlayer) { - BRIDGE.sendTabListAdd(recipient, listPlayer); + public static boolean sendTabListAdd(Player recipient, Player listPlayer) { + return BRIDGE.sendTabListAdd(recipient, listPlayer); } public static void sendTabListRemove(Player recipient, Collection skinnableNPCs) { diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java index 65352294b..e7f2b2a63 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java +++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java @@ -137,7 +137,7 @@ public interface NMSBridge { public void sendRotationNearby(Entity from, float bodyYaw, float headYaw, float pitch); - public void sendTabListAdd(Player recipient, Player listPlayer); + public boolean sendTabListAdd(Player recipient, Player listPlayer); public void sendTabListRemove(Player recipient, Collection skinnableNPCs); diff --git a/pom.xml b/pom.xml index 77523bbf4..3bacbf552 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ v1_16_R3 v1_17_R1 v1_18_R2 - v1_19_R1 + v1_19_R2 dist \ No newline at end of file diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index 88759364c..1d29e7a02 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -983,7 +983,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -991,6 +991,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index b7d73e090..a49c79903 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java @@ -1040,7 +1040,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1048,6 +1048,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override 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 17588b0c8..a72505f01 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 @@ -1050,7 +1050,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1058,6 +1058,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index 17c68313e..9962235b8 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -1086,7 +1086,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1094,6 +1094,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index b9ed7998f..84b4a1c00 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -1141,7 +1141,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1149,6 +1149,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 7daf7dad5..da4956f3a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -1153,7 +1153,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1161,6 +1161,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index a9d54448d..f4ab1ed1a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -1183,7 +1183,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1191,6 +1191,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index 90a191b86..88d146679 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -1174,7 +1174,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1182,6 +1182,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index d0b4508b2..a98ae5f23 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -1181,7 +1181,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -1189,6 +1189,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, entity)); + return true; } @Override diff --git a/v1_19_R1/pom.xml b/v1_19_R2/pom.xml similarity index 97% rename from v1_19_R1/pom.xml rename to v1_19_R2/pom.xml index e78216ef2..715b9a3c7 100644 --- a/v1_19_R1/pom.xml +++ b/v1_19_R2/pom.xml @@ -6,11 +6,11 @@ citizens-parent 2.0.30-SNAPSHOT - citizens-v1_19_R1 + citizens-v1_19_R2 UTF-8 - 1.19.2-R0.1-SNAPSHOT + 1.19.3-R0.1-SNAPSHOT diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java index a0cea6366..a1779a9ec 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AllayController.java @@ -1,9 +1,9 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftAllay; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftAllay; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import com.google.common.collect.Lists; @@ -13,8 +13,8 @@ import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java index 0e194352d..53e4a42dc 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/AxolotlController.java @@ -1,9 +1,9 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftAxolotl; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftAxolotl; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import com.mojang.serialization.Dynamic; @@ -11,8 +11,8 @@ import com.mojang.serialization.Dynamic; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java index 25c13a668..bffff7e2d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BatController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftBat; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftBat; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java index 2e9737de6..4b8baa4a5 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BeeController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftBee; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftBee; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java index 87acfad55..706721d2d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/BlazeController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftBlaze; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java index 32bfc652f..db250fb9e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CatController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftCat; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftCat; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java index 4a98584f4..0b96c75ea 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CaveSpiderController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftCaveSpider; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java index 1f315aa46..32c4e589d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ChickenController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftChicken; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java index 57867ddfd..21ae12317 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CodController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftCod; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftCod; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java index 8fbf62340..b69ca73cc 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CowController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftCow; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftCow; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java index bdba65aa4..cb75cd49f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/CreeperController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftCreeper; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java index 926151ddc..b05fdf9c8 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DolphinController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftDolphin; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftDolphin; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java index 4b5c90df0..2dedd6c08 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/DrownedController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftDrowned; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftDrowned; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java index 9c3b18d52..f86b53666 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EnderDragonController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEnderDragon; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java index c73bae7d9..0627abac7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermanController.java @@ -1,19 +1,19 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import java.util.Optional; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEnderman; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java index 8912541fe..92553b840 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EndermiteController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEndermite; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEndermite; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java index 17d587a68..bc7b0ee3f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EntityHumanNPC.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import java.io.IOException; import java.lang.invoke.MethodHandle; @@ -9,8 +9,8 @@ import java.util.function.Consumer; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; @@ -30,15 +30,15 @@ import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.SpigotUtil; -import net.citizensnpcs.nms.v1_19_R1.network.EmptyNetHandler; -import net.citizensnpcs.nms.v1_19_R1.network.EmptyNetworkManager; -import net.citizensnpcs.nms.v1_19_R1.util.EmptyAdvancementDataPlayer; -import net.citizensnpcs.nms.v1_19_R1.util.EmptyServerStatsCounter; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerControllerJump; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerNavigation; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerlistTracker; +import net.citizensnpcs.nms.v1_19_R2.network.EmptyNetHandler; +import net.citizensnpcs.nms.v1_19_R2.network.EmptyNetworkManager; +import net.citizensnpcs.nms.v1_19_R2.util.EmptyAdvancementDataPlayer; +import net.citizensnpcs.nms.v1_19_R2.util.EmptyServerStatsCounter; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerControllerJump; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerNavigation; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerlistTracker; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.skin.SkinPacketTracker; @@ -54,6 +54,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.contents.LiteralContents; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; +import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; @@ -71,7 +72,6 @@ import net.minecraft.world.entity.ai.attributes.AttributeMap; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.navigation.PathNavigation; -import net.minecraft.world.entity.player.ProfilePublicKey; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.GameType; import net.minecraft.world.level.block.state.BlockState; @@ -95,9 +95,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable private EmptyServerStatsCounter statsCache; private int updateCounter = 0; - public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GameProfile gameProfile, - ProfilePublicKey ppk, NPC npc) { - super(minecraftServer, world, gameProfile, ppk); + public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GameProfile gameProfile, NPC npc) { + super(minecraftServer, world, gameProfile); this.npc = (CitizensNPC) npc; if (npc != null) { skinTracker = new SkinPacketTracker(this); @@ -224,7 +223,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable } @Override - public Packet getAddEntityPacket() { + public Packet getAddEntityPacket() { if (playerlistTracker != null) { playerlistTracker.updateLastPlayer(); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java index 4f6cb4490..b7cf3e000 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/EvokerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEvoker; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEvoker; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java index 9b90a77a3..f95b2c78c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FoxController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftFox; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftFox; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java index f1b400cd1..af4a63d65 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/FrogController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftFrog; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftFrog; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java index 6d8973235..46792364f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GhastController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftGhast; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java index d4ed601df..2885ae30b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GiantController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftGiant; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java index 6aee328ed..09589777e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GlowSquidController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftGlowSquid; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftGlowSquid; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java index 264e68797..07fbea690 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GoatController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftGoat; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftGoat; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java index 3e0d059f2..6f0a42c6f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftGuardian; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftGuardian; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java index 6e6c2c8db..d26bc3af7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/GuardianElderController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftElderGuardian; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftElderGuardian; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java index 1fcbb6e50..f60102b7b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HoglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HoglinController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftHoglin; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftHoglin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java index 47a1b6bd5..942996508 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftHorse; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java index 18df6763f..4f00cd154 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseDonkeyController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftDonkey; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftDonkey; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java index cc78e843e..50f174796 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseMuleController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMule; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMule; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java index 8f886e375..4ea071ea4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseSkeletonController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSkeletonHorse; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSkeletonHorse; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java index 9cbbc8390..845dd3d18 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HorseZombieController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftZombieHorse; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftZombieHorse; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HumanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HumanController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java index 602305045..752613e2f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HumanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/HumanController.java @@ -1,10 +1,10 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -49,7 +49,7 @@ public class HumanController extends AbstractEntityController { } final GameProfile profile = new GameProfile(uuid, name); - final EntityHumanNPC handle = new EntityHumanNPC(MinecraftServer.getServer(), nmsWorld, profile, null, npc); + final EntityHumanNPC handle = new EntityHumanNPC(MinecraftServer.getServer(), nmsWorld, profile, npc); Skin skin = handle.getSkinTracker().getSkin(); if (skin != null) { diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java index dc96bd4cf..54beccd11 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IllusionerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftIllusioner; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftIllusioner; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java index e5013c16f..2325432ff 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/IronGolemController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftIronGolem; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java index 9432ae9de..41cebfb57 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/LlamaController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftLlama; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftLlama; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java index 13b046c74..de1d7d5c6 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MagmaCubeController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMagmaCube; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MobEntityController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MobEntityController.java index 4a52cce61..4956348d3 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MobEntityController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import java.lang.reflect.Constructor; import java.util.Map; @@ -6,12 +6,12 @@ import java.util.WeakHashMap; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; import org.bukkit.entity.Entity; import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.trait.ScoreboardTrait; import net.minecraft.world.entity.EntityType; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java index 5dc1f0872..a7e919fc5 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/MushroomCowController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMushroomCow; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java index 059fa7454..dc609b3f3 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/OcelotController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftOcelot; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java index bcb419a34..002150a6c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PandaController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPanda; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPanda; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java index a67cb9c06..c397807ce 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ParrotController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftParrot; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftParrot; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java index 8014b9d17..587d2bc19 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PhantomController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPhantom; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPhantom; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java index 5f4adc05a..2e7124ab1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPig; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPig; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java index 2a6b2ceac..2a6a8c489 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PigZombieController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPigZombie; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java index d909e8dab..15ef1d8de 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinBruteController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPiglinBrute; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPiglinBrute; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java index 36fb54089..a17ee5205 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PiglinController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPiglin; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPiglin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java index 29d2d5305..6f46ffe96 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PillagerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPillager; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPillager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java index 4b41af44b..10b4aeb9b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PolarBearController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPolarBear; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPolarBear; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java index 1fc19dbb7..29db5abe3 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/PufferFishController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPufferFish; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPufferFish; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.versioned.PufferFishTrait; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java index d38d55173..85dd70e09 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RabbitController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftRabbit; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftRabbit; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -206,14 +206,14 @@ public class RabbitController extends MobEntityController { } @Override - public void setRabbitType(int i) { + public void setVariant(Variant variant) { if (npc != null) { if (NMSImpl.getRabbitTypeField() == null) return; - this.entityData.set(NMSImpl.getRabbitTypeField(), i); + this.entityData.set(NMSImpl.getRabbitTypeField(), variant.id()); return; } - super.setRabbitType(i); + super.setVariant(variant); } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java index 49c3676dc..294d2f5dd 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/RavagerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftRavager; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftRavager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java index c6dfa4258..55913dc38 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SalmonController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSalmon; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSalmon; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java index 2c113884e..715e6ee46 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SheepController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSheep; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java index 8664d6e01..1e6448334 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ShulkerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftShulker; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftShulker; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java index c209f4e10..c3fafe35c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SilverfishController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSilverfish; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java index 1910e527e..b905edbd1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSkeleton; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java index 1fd0671d7..6d38ce27c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonStrayController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftStray; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftStray; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java index 0dfe1477f..efa80e0bf 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SkeletonWitherController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWitherSkeleton; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWitherSkeleton; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java index 169203530..c07ff88a7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SlimeController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSlime; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java index 61a5b39d0..666174f70 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SnowmanController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.GameRule; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSnowman; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java index 146dab620..8d1cd79ea 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SpiderController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSpider; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java index 1f981b4b1..efd863781 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/SquidController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSquid; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java index ca57aa09f..390848121 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/StriderController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftStrider; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftStrider; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java index d088d090d..7739dd1ec 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TadpoleController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTadpole; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTadpole; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java index 079a0db1f..386d46f02 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TraderLlamaController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTraderLlama; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTraderLlama; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java index 57bb32715..9b964ba95 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TropicalFishController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTropicalFish; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTropicalFish; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java index 2ba6bc5f7..ae5ceda53 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/TurtleController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTurtle; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTurtle; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; -import net.citizensnpcs.nms.v1_19_R1.util.PlayerMoveControl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.PlayerMoveControl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java index 4acded878..55f4a0fd7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VexController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftVex; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftVex; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java index c60cdf82e..257e704e7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VillagerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftVillager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java index b6abea7b3..582d91ea4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/VindicatorController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftVindicator; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftVindicator; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java index f6394b666..9aa68e6c1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WanderingTraderController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWanderingTrader; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWanderingTrader; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java index 604876f45..20e43b494 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WardenController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWarden; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWarden; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java index 68153e506..2da687c96 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitchController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWitch; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java index 71b180aad..1fbdeeaab 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WitherController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWither; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWither; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java similarity index 96% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java index fb1799a9a..4f9cfab25 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/WolfController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWolf; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java index 267f39105..f14843827 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZoglinController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftZoglin; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftZoglin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java index 10402dd76..633bb09a4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftZombie; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java index 4256210b8..9d89529ea 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieHuskController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftHusk; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftHusk; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java index a73a5b376..6d3337719 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/ZombieVillagerController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity; +package net.citizensnpcs.nms.v1_19_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftVillagerZombie; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftVillagerZombie; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCKnockbackEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/AreaEffectCloudController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/AreaEffectCloudController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java index 381005735..a4919f69f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/AreaEffectCloudController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/AreaEffectCloudController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftAreaEffectCloud; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftAreaEffectCloud; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ArmorStandController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ArmorStandController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java index e68f2a1e7..4161b6aa2 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ArmorStandController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ArmorStandController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftArmorStand; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/BoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/BoatController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java index a887e7189..76d522606 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/BoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/BoatController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftBoat; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ChestBoatController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ChestBoatController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java index 8b9ca6829..36da011c8 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ChestBoatController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ChestBoatController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftChestBoat; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftChestBoat; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/DragonFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/DragonFireballController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java index ffa6f7fd6..3aa9a96ce 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/DragonFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/DragonFireballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftDragonFireball; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftDragonFireball; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EggController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EggController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java index 7d4c9dd13..3a9d2f0ed 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EggController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EggController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEgg; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEgg; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderCrystalController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderCrystalController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java index 4691e70e8..5b31f2aed 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderCrystalController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderCrystalController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEnderCrystal; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEnderCrystal; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderPearlController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderPearlController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java index bc3da7389..bb17d1249 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderPearlController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderPearlController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEnderPearl; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEnderPearl; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.entity.EnderPearl; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderSignalController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderSignalController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java index 0714343e3..b5f0d86f2 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EnderSignalController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EnderSignalController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEnderSignal; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEnderSignal; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.entity.EnderSignal; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EvokerFangsController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EvokerFangsController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java index 7c4cea55e..a3aa26972 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/EvokerFangsController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/EvokerFangsController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEvokerFangs; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEvokerFangs; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ExperienceOrbController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ExperienceOrbController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java index db51f5510..b57cd91bf 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ExperienceOrbController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ExperienceOrbController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftExperienceOrb; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftExperienceOrb; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java similarity index 92% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java index f6fe4f638..f5d39aa67 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FallingBlockController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FallingBlockController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftFallingBlock; -import org.bukkit.craftbukkit.v1_19_R1.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftFallingBlock; +import org.bukkit.craftbukkit.v1_19_R2.util.CraftMagicNumbers; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FireworkController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FireworkController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java index 1a6e4448b..eac4c77fd 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FireworkController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FireworkController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftFirework; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftFirework; import org.bukkit.entity.Firework; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FishingHookController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FishingHookController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java index 281a6895e..9195bef66 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/FishingHookController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/FishingHookController.java @@ -1,20 +1,20 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import java.util.UUID; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftFishHook; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftFishHook; import org.bukkit.entity.FishHook; import org.bukkit.util.Vector; import com.mojang.authlib.GameProfile; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; @@ -52,7 +52,7 @@ public class FishingHookController extends MobEntityController { public EntityFishingHookNPC(EntityType types, Level level, NPC npc) { super(new ServerPlayer(MinecraftServer.getServer(), (ServerLevel) level, - new GameProfile(UUID.randomUUID(), "dummyfishhook"), null) { + new GameProfile(UUID.randomUUID(), "dummyfishhook")) { }, level, 0, 0); this.npc = (CitizensNPC) npc; } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/GlowItemFrameController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java similarity index 92% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/GlowItemFrameController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java index 3f5a8c390..d467f684e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/GlowItemFrameController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/GlowItemFrameController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftGlowItemFrame; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftGlowItemFrame; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ItemFrameController.EntityItemFrameNPC; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ItemFrameController.EntityItemFrameNPC; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java index 3bc0e067e..21e1fa14d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftItem; -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftItem; +import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.entity.Item; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemFrameController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java similarity index 92% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemFrameController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java index dc02177bb..fc1e4cde0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ItemFrameController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ItemFrameController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftItemFrame; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftItemFrame; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LargeFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LargeFireballController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java index 80969fa6e..156ed2f56 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LargeFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LargeFireballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftLargeFireball; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftLargeFireball; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LeashController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LeashController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java index d6b648eac..076902682 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LeashController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LeashController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftLeash; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftLeash; import org.bukkit.entity.LeashHitch; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LlamaSpitController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LlamaSpitController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java index 96ea26490..c0148aee6 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/LlamaSpitController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/LlamaSpitController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftLlamaSpit; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftLlamaSpit; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MarkerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MarkerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java index a9d272afd..c5165e817 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MarkerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MarkerController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMarker; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMarker; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartChestController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartChestController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java index 817cc73d0..18acbc97d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartChestController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartChestController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMinecartChest; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMinecartChest; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartCommandController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartCommandController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java index 1c4ae1b4b..223399f3d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartCommandController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMinecartCommand; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMinecartCommand; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartFurnaceController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartFurnaceController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java index 44ab58790..387111d07 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartFurnaceController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMinecartFurnace; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMinecartFurnace; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartHopperController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartHopperController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java index 928241242..79ddf7061 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartHopperController.java @@ -1,11 +1,11 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartRideableController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartRideableController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java index 1f1acb508..d2ce0451e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartRideableController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftMinecartRideable; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftMinecartRideable; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartSpawnerController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartSpawnerController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java index 74224aa5d..8957f32f0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartSpawnerController.java @@ -1,11 +1,11 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartTNTController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java similarity index 94% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartTNTController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java index 7498bfe22..cf9c2022b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/MinecartTNTController.java @@ -1,11 +1,11 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/PaintingController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/PaintingController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java index a5c75cb00..f6c252deb 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/PaintingController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/PaintingController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPainting; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPainting; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ShulkerBulletController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ShulkerBulletController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java index 473ef1d11..92cbb9d3d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ShulkerBulletController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ShulkerBulletController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftShulkerBullet; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftShulkerBullet; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SmallFireballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SmallFireballController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java index bf889a6fa..7146213d8 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SmallFireballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SmallFireballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSmallFireball; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSmallFireball; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SnowballController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SnowballController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java index d65d5e8dd..ca37ba003 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SnowballController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SnowballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftSnowball; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftSnowball; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SpectralArrowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SpectralArrowController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java index 4c1eaaa89..e208ef01a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/SpectralArrowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/SpectralArrowController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftArrow; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; import org.bukkit.entity.Arrow; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/TNTPrimedController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/TNTPrimedController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java index 1f3d67382..95e3a9ee4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/TNTPrimedController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TNTPrimedController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTNTPrimed; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTNTPrimed; import org.bukkit.entity.TNTPrimed; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownExpBottleController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownExpBottleController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java index ebe08e2a5..821e3b93b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownExpBottleController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownExpBottleController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftThrownExpBottle; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftThrownExpBottle; import org.bukkit.entity.ThrownExpBottle; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownPotionController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownPotionController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java index 82872c6f3..355261230 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownPotionController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownPotionController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftThrownPotion; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownTridentController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownTridentController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java index 1de5b952b..c637101ac 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/ThrownTridentController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/ThrownTridentController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTrident; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTrident; import org.bukkit.entity.Trident; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/TippedArrowController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/TippedArrowController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java index ea2d2fb61..187c8022a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/TippedArrowController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/TippedArrowController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftTippedArrow; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftTippedArrow; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/WitherSkullController.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/WitherSkullController.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java index 97acb0bcd..7b64610ea 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/nonliving/WitherSkullController.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/entity/nonliving/WitherSkullController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_19_R1.entity.nonliving; +package net.citizensnpcs.nms.v1_19_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWitherSkull; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWitherSkull; import org.bukkit.util.Vector; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_19_R1.entity.MobEntityController; -import net.citizensnpcs.nms.v1_19_R1.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/network/EmptyNetHandler.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/network/EmptyNetHandler.java similarity index 92% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/network/EmptyNetHandler.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/network/EmptyNetHandler.java index cbe486e43..7e29c09e0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/network/EmptyNetHandler.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/network/EmptyNetHandler.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.network; +package net.citizensnpcs.nms.v1_19_R2.network; import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/network/EmptyNetworkManager.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/network/EmptyNetworkManager.java similarity index 85% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/network/EmptyNetworkManager.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/network/EmptyNetworkManager.java index a309d7a42..10685ee9d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/network/EmptyNetworkManager.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/network/EmptyNetworkManager.java @@ -1,8 +1,8 @@ -package net.citizensnpcs.nms.v1_19_R1.network; +package net.citizensnpcs.nms.v1_19_R2.network; import java.io.IOException; -import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; +import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl; import net.minecraft.network.Connection; import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.Packet; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/CitizensBlockBreaker.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java similarity index 97% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/CitizensBlockBreaker.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java index 70388e77b..04a8f8f47 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/CitizensBlockBreaker.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CitizensBlockBreaker.java @@ -1,6 +1,6 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import net.citizensnpcs.util.AbstractBlockBreaker; import net.minecraft.core.BlockPos; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/CustomEntityRegistry.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CustomEntityRegistry.java similarity index 97% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/CustomEntityRegistry.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CustomEntityRegistry.java index ab09d0480..429cf84ba 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/CustomEntityRegistry.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CustomEntityRegistry.java @@ -1,11 +1,10 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.lang.invoke.MethodHandle; import java.util.Iterator; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.function.Function; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -13,6 +12,7 @@ import com.google.common.collect.Maps; import com.mojang.serialization.Lifecycle; import net.citizensnpcs.util.NMS; +import net.minecraft.core.DefaultedMappedRegistry; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; @@ -139,7 +139,7 @@ import net.minecraft.world.entity.vehicle.MinecartSpawner; import net.minecraft.world.entity.vehicle.MinecartTNT; @SuppressWarnings("rawtypes") -public class CustomEntityRegistry extends DefaultedRegistry { +public class CustomEntityRegistry extends DefaultedMappedRegistry { private final BiMap entities = HashBiMap.create(); private final BiMap entityClasses = this.entities.inverse(); private final Map entityIds = Maps.newHashMap(); @@ -149,9 +149,8 @@ public class CustomEntityRegistry extends DefaultedRegistry { public CustomEntityRegistry(DefaultedRegistry> original) throws Throwable { super(original.getDefaultKey().getNamespace(), (ResourceKey>>) IREGISTRY_RESOURCE_KEY.invoke(original), - (Lifecycle) IREGISTRY_LIFECYCLE.invoke(original), - (Function) IREGISTRY_CUSTOM_HOLDER_PROVDER.invoke(original)); - this.wrapped = original; + (Lifecycle) IREGISTRY_LIFECYCLE.invoke(original), IREGISTRY_HOLDER_PROVDER.invoke(original) != null); + this.wrapped = (MappedRegistry>) original; } @Override @@ -231,11 +230,11 @@ public class CustomEntityRegistry extends DefaultedRegistry { entityIds.put(entityClass, entityId); } - private static final MethodHandle IREGISTRY_CUSTOM_HOLDER_PROVDER = NMS.getFirstGetter(MappedRegistry.class, - Function.class); - private static final MethodHandle IREGISTRY_LIFECYCLE = NMS.getFirstGetter(Registry.class, Lifecycle.class); + private static final MethodHandle IREGISTRY_HOLDER_PROVDER = NMS.getGetter(MappedRegistry.class, "m"); + private static final MethodHandle IREGISTRY_LIFECYCLE = NMS.getFirstGetter(MappedRegistry.class, Lifecycle.class); // replace regex .*?> ([A-Z_]+).*?of\((.*?)::new.*?$ minecraftClassMap.put(EntityType.\1, \2.class); - private static final MethodHandle IREGISTRY_RESOURCE_KEY = NMS.getGetter(Registry.class, "bT"); + private static final MethodHandle IREGISTRY_RESOURCE_KEY = NMS.getFirstGetter(MappedRegistry.class, + ResourceKey.class); private static final BiMap> minecraftClassMap = HashBiMap.create(); static { minecraftClassMap.put(EntityType.ALLAY, Allay.class); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/EmptyAdvancementDataPlayer.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/EmptyAdvancementDataPlayer.java similarity index 98% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/EmptyAdvancementDataPlayer.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/EmptyAdvancementDataPlayer.java index 2df6a50ec..f1b2f4205 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/EmptyAdvancementDataPlayer.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/EmptyAdvancementDataPlayer.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.io.File; import java.lang.invoke.MethodHandle; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/EmptyServerStatsCounter.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/EmptyServerStatsCounter.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/EmptyServerStatsCounter.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/EmptyServerStatsCounter.java index 691236c91..b86db615d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/EmptyServerStatsCounter.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/EmptyServerStatsCounter.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import com.mojang.datafixers.DataFixer; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/ForwardingNPCHolder.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/ForwardingNPCHolder.java similarity index 93% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/ForwardingNPCHolder.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/ForwardingNPCHolder.java index 5d436d213..83ca557e6 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/ForwardingNPCHolder.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/ForwardingNPCHolder.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import org.bukkit.entity.Entity; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSBoundingBox.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSBoundingBox.java similarity index 91% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSBoundingBox.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSBoundingBox.java index 6d4d1e769..8c517ec62 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSBoundingBox.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSBoundingBox.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import net.citizensnpcs.api.util.BoundingBox; import net.minecraft.world.phys.AABB; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java index c0fb4e01a..ff168b28c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/NMSImpl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; @@ -15,6 +15,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; import java.util.TreeMap; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -25,19 +26,19 @@ import org.bukkit.block.data.BlockData; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; import org.bukkit.boss.BossBar; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftSound; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_19_R1.boss.CraftBossBar; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWither; -import org.bukkit.craftbukkit.v1_19_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_19_R1.event.CraftPortalEvent; -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventoryAnvil; -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventoryView; -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftSound; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_19_R2.boss.CraftBossBar; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWither; +import org.bukkit.craftbukkit.v1_19_R2.event.CraftEventFactory; +import org.bukkit.craftbukkit.v1_19_R2.event.CraftPortalEvent; +import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftInventoryAnvil; +import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftInventoryView; +import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.entity.FishHook; import org.bukkit.entity.Player; @@ -94,122 +95,122 @@ import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.Messaging; -import net.citizensnpcs.nms.v1_19_R1.entity.AllayController; -import net.citizensnpcs.nms.v1_19_R1.entity.AxolotlController; -import net.citizensnpcs.nms.v1_19_R1.entity.BatController; -import net.citizensnpcs.nms.v1_19_R1.entity.BeeController; -import net.citizensnpcs.nms.v1_19_R1.entity.BlazeController; -import net.citizensnpcs.nms.v1_19_R1.entity.CatController; -import net.citizensnpcs.nms.v1_19_R1.entity.CaveSpiderController; -import net.citizensnpcs.nms.v1_19_R1.entity.ChickenController; -import net.citizensnpcs.nms.v1_19_R1.entity.CodController; -import net.citizensnpcs.nms.v1_19_R1.entity.CowController; -import net.citizensnpcs.nms.v1_19_R1.entity.CreeperController; -import net.citizensnpcs.nms.v1_19_R1.entity.DolphinController; -import net.citizensnpcs.nms.v1_19_R1.entity.DrownedController; -import net.citizensnpcs.nms.v1_19_R1.entity.EnderDragonController; -import net.citizensnpcs.nms.v1_19_R1.entity.EndermanController; -import net.citizensnpcs.nms.v1_19_R1.entity.EndermiteController; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; -import net.citizensnpcs.nms.v1_19_R1.entity.EvokerController; -import net.citizensnpcs.nms.v1_19_R1.entity.FoxController; -import net.citizensnpcs.nms.v1_19_R1.entity.FrogController; -import net.citizensnpcs.nms.v1_19_R1.entity.GhastController; -import net.citizensnpcs.nms.v1_19_R1.entity.GiantController; -import net.citizensnpcs.nms.v1_19_R1.entity.GlowSquidController; -import net.citizensnpcs.nms.v1_19_R1.entity.GoatController; -import net.citizensnpcs.nms.v1_19_R1.entity.GuardianController; -import net.citizensnpcs.nms.v1_19_R1.entity.GuardianElderController; -import net.citizensnpcs.nms.v1_19_R1.entity.HoglinController; -import net.citizensnpcs.nms.v1_19_R1.entity.HorseController; -import net.citizensnpcs.nms.v1_19_R1.entity.HorseDonkeyController; -import net.citizensnpcs.nms.v1_19_R1.entity.HorseMuleController; -import net.citizensnpcs.nms.v1_19_R1.entity.HorseSkeletonController; -import net.citizensnpcs.nms.v1_19_R1.entity.HorseZombieController; -import net.citizensnpcs.nms.v1_19_R1.entity.HumanController; -import net.citizensnpcs.nms.v1_19_R1.entity.IllusionerController; -import net.citizensnpcs.nms.v1_19_R1.entity.IronGolemController; -import net.citizensnpcs.nms.v1_19_R1.entity.LlamaController; -import net.citizensnpcs.nms.v1_19_R1.entity.MagmaCubeController; -import net.citizensnpcs.nms.v1_19_R1.entity.MushroomCowController; -import net.citizensnpcs.nms.v1_19_R1.entity.OcelotController; -import net.citizensnpcs.nms.v1_19_R1.entity.PandaController; -import net.citizensnpcs.nms.v1_19_R1.entity.ParrotController; -import net.citizensnpcs.nms.v1_19_R1.entity.PhantomController; -import net.citizensnpcs.nms.v1_19_R1.entity.PigController; -import net.citizensnpcs.nms.v1_19_R1.entity.PigZombieController; -import net.citizensnpcs.nms.v1_19_R1.entity.PiglinBruteController; -import net.citizensnpcs.nms.v1_19_R1.entity.PiglinController; -import net.citizensnpcs.nms.v1_19_R1.entity.PillagerController; -import net.citizensnpcs.nms.v1_19_R1.entity.PolarBearController; -import net.citizensnpcs.nms.v1_19_R1.entity.PufferFishController; -import net.citizensnpcs.nms.v1_19_R1.entity.RabbitController; -import net.citizensnpcs.nms.v1_19_R1.entity.RavagerController; -import net.citizensnpcs.nms.v1_19_R1.entity.SalmonController; -import net.citizensnpcs.nms.v1_19_R1.entity.SheepController; -import net.citizensnpcs.nms.v1_19_R1.entity.ShulkerController; -import net.citizensnpcs.nms.v1_19_R1.entity.SilverfishController; -import net.citizensnpcs.nms.v1_19_R1.entity.SkeletonController; -import net.citizensnpcs.nms.v1_19_R1.entity.SkeletonStrayController; -import net.citizensnpcs.nms.v1_19_R1.entity.SkeletonWitherController; -import net.citizensnpcs.nms.v1_19_R1.entity.SlimeController; -import net.citizensnpcs.nms.v1_19_R1.entity.SnowmanController; -import net.citizensnpcs.nms.v1_19_R1.entity.SpiderController; -import net.citizensnpcs.nms.v1_19_R1.entity.SquidController; -import net.citizensnpcs.nms.v1_19_R1.entity.StriderController; -import net.citizensnpcs.nms.v1_19_R1.entity.TadpoleController; -import net.citizensnpcs.nms.v1_19_R1.entity.TraderLlamaController; -import net.citizensnpcs.nms.v1_19_R1.entity.TropicalFishController; -import net.citizensnpcs.nms.v1_19_R1.entity.TurtleController; -import net.citizensnpcs.nms.v1_19_R1.entity.VexController; -import net.citizensnpcs.nms.v1_19_R1.entity.VillagerController; -import net.citizensnpcs.nms.v1_19_R1.entity.VindicatorController; -import net.citizensnpcs.nms.v1_19_R1.entity.WanderingTraderController; -import net.citizensnpcs.nms.v1_19_R1.entity.WardenController; -import net.citizensnpcs.nms.v1_19_R1.entity.WitchController; -import net.citizensnpcs.nms.v1_19_R1.entity.WitherController; -import net.citizensnpcs.nms.v1_19_R1.entity.WolfController; -import net.citizensnpcs.nms.v1_19_R1.entity.ZoglinController; -import net.citizensnpcs.nms.v1_19_R1.entity.ZombieController; -import net.citizensnpcs.nms.v1_19_R1.entity.ZombieHuskController; -import net.citizensnpcs.nms.v1_19_R1.entity.ZombieVillagerController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ArmorStandController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.BoatController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ChestBoatController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.DragonFireballController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.EggController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.EnderCrystalController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.EnderPearlController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.EnderSignalController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.EvokerFangsController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.FallingBlockController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.FireworkController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.FishingHookController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.GlowItemFrameController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ItemController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ItemFrameController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.LargeFireballController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.LeashController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.LlamaSpitController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MarkerController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MinecartChestController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MinecartCommandController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MinecartFurnaceController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MinecartHopperController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MinecartRideableController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.MinecartTNTController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.PaintingController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ShulkerBulletController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.SmallFireballController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.SnowballController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.SpectralArrowController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.TNTPrimedController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ThrownExpBottleController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ThrownPotionController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.ThrownTridentController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.TippedArrowController; -import net.citizensnpcs.nms.v1_19_R1.entity.nonliving.WitherSkullController; +import net.citizensnpcs.nms.v1_19_R2.entity.AllayController; +import net.citizensnpcs.nms.v1_19_R2.entity.AxolotlController; +import net.citizensnpcs.nms.v1_19_R2.entity.BatController; +import net.citizensnpcs.nms.v1_19_R2.entity.BeeController; +import net.citizensnpcs.nms.v1_19_R2.entity.BlazeController; +import net.citizensnpcs.nms.v1_19_R2.entity.CatController; +import net.citizensnpcs.nms.v1_19_R2.entity.CaveSpiderController; +import net.citizensnpcs.nms.v1_19_R2.entity.ChickenController; +import net.citizensnpcs.nms.v1_19_R2.entity.CodController; +import net.citizensnpcs.nms.v1_19_R2.entity.CowController; +import net.citizensnpcs.nms.v1_19_R2.entity.CreeperController; +import net.citizensnpcs.nms.v1_19_R2.entity.DolphinController; +import net.citizensnpcs.nms.v1_19_R2.entity.DrownedController; +import net.citizensnpcs.nms.v1_19_R2.entity.EnderDragonController; +import net.citizensnpcs.nms.v1_19_R2.entity.EndermanController; +import net.citizensnpcs.nms.v1_19_R2.entity.EndermiteController; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EvokerController; +import net.citizensnpcs.nms.v1_19_R2.entity.FoxController; +import net.citizensnpcs.nms.v1_19_R2.entity.FrogController; +import net.citizensnpcs.nms.v1_19_R2.entity.GhastController; +import net.citizensnpcs.nms.v1_19_R2.entity.GiantController; +import net.citizensnpcs.nms.v1_19_R2.entity.GlowSquidController; +import net.citizensnpcs.nms.v1_19_R2.entity.GoatController; +import net.citizensnpcs.nms.v1_19_R2.entity.GuardianController; +import net.citizensnpcs.nms.v1_19_R2.entity.GuardianElderController; +import net.citizensnpcs.nms.v1_19_R2.entity.HoglinController; +import net.citizensnpcs.nms.v1_19_R2.entity.HorseController; +import net.citizensnpcs.nms.v1_19_R2.entity.HorseDonkeyController; +import net.citizensnpcs.nms.v1_19_R2.entity.HorseMuleController; +import net.citizensnpcs.nms.v1_19_R2.entity.HorseSkeletonController; +import net.citizensnpcs.nms.v1_19_R2.entity.HorseZombieController; +import net.citizensnpcs.nms.v1_19_R2.entity.HumanController; +import net.citizensnpcs.nms.v1_19_R2.entity.IllusionerController; +import net.citizensnpcs.nms.v1_19_R2.entity.IronGolemController; +import net.citizensnpcs.nms.v1_19_R2.entity.LlamaController; +import net.citizensnpcs.nms.v1_19_R2.entity.MagmaCubeController; +import net.citizensnpcs.nms.v1_19_R2.entity.MushroomCowController; +import net.citizensnpcs.nms.v1_19_R2.entity.OcelotController; +import net.citizensnpcs.nms.v1_19_R2.entity.PandaController; +import net.citizensnpcs.nms.v1_19_R2.entity.ParrotController; +import net.citizensnpcs.nms.v1_19_R2.entity.PhantomController; +import net.citizensnpcs.nms.v1_19_R2.entity.PigController; +import net.citizensnpcs.nms.v1_19_R2.entity.PigZombieController; +import net.citizensnpcs.nms.v1_19_R2.entity.PiglinBruteController; +import net.citizensnpcs.nms.v1_19_R2.entity.PiglinController; +import net.citizensnpcs.nms.v1_19_R2.entity.PillagerController; +import net.citizensnpcs.nms.v1_19_R2.entity.PolarBearController; +import net.citizensnpcs.nms.v1_19_R2.entity.PufferFishController; +import net.citizensnpcs.nms.v1_19_R2.entity.RabbitController; +import net.citizensnpcs.nms.v1_19_R2.entity.RavagerController; +import net.citizensnpcs.nms.v1_19_R2.entity.SalmonController; +import net.citizensnpcs.nms.v1_19_R2.entity.SheepController; +import net.citizensnpcs.nms.v1_19_R2.entity.ShulkerController; +import net.citizensnpcs.nms.v1_19_R2.entity.SilverfishController; +import net.citizensnpcs.nms.v1_19_R2.entity.SkeletonController; +import net.citizensnpcs.nms.v1_19_R2.entity.SkeletonStrayController; +import net.citizensnpcs.nms.v1_19_R2.entity.SkeletonWitherController; +import net.citizensnpcs.nms.v1_19_R2.entity.SlimeController; +import net.citizensnpcs.nms.v1_19_R2.entity.SnowmanController; +import net.citizensnpcs.nms.v1_19_R2.entity.SpiderController; +import net.citizensnpcs.nms.v1_19_R2.entity.SquidController; +import net.citizensnpcs.nms.v1_19_R2.entity.StriderController; +import net.citizensnpcs.nms.v1_19_R2.entity.TadpoleController; +import net.citizensnpcs.nms.v1_19_R2.entity.TraderLlamaController; +import net.citizensnpcs.nms.v1_19_R2.entity.TropicalFishController; +import net.citizensnpcs.nms.v1_19_R2.entity.TurtleController; +import net.citizensnpcs.nms.v1_19_R2.entity.VexController; +import net.citizensnpcs.nms.v1_19_R2.entity.VillagerController; +import net.citizensnpcs.nms.v1_19_R2.entity.VindicatorController; +import net.citizensnpcs.nms.v1_19_R2.entity.WanderingTraderController; +import net.citizensnpcs.nms.v1_19_R2.entity.WardenController; +import net.citizensnpcs.nms.v1_19_R2.entity.WitchController; +import net.citizensnpcs.nms.v1_19_R2.entity.WitherController; +import net.citizensnpcs.nms.v1_19_R2.entity.WolfController; +import net.citizensnpcs.nms.v1_19_R2.entity.ZoglinController; +import net.citizensnpcs.nms.v1_19_R2.entity.ZombieController; +import net.citizensnpcs.nms.v1_19_R2.entity.ZombieHuskController; +import net.citizensnpcs.nms.v1_19_R2.entity.ZombieVillagerController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.AreaEffectCloudController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ArmorStandController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.BoatController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ChestBoatController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.DragonFireballController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.EggController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.EnderCrystalController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.EnderPearlController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.EnderSignalController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.EvokerFangsController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.FallingBlockController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.FireworkController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.FishingHookController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.GlowItemFrameController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ItemController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ItemFrameController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.LargeFireballController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.LeashController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.LlamaSpitController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MarkerController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MinecartChestController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MinecartCommandController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MinecartFurnaceController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MinecartHopperController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MinecartRideableController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.MinecartTNTController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.PaintingController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ShulkerBulletController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.SmallFireballController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.SnowballController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.SpectralArrowController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.TNTPrimedController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ThrownExpBottleController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ThrownPotionController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.ThrownTridentController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.TippedArrowController; +import net.citizensnpcs.nms.v1_19_R2.entity.nonliving.WitherSkullController; import net.citizensnpcs.npc.EntityControllers; import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator; @@ -247,7 +248,7 @@ import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; import net.minecraft.core.BlockPos; import net.minecraft.core.PositionImpl; -import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.Connection; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -255,7 +256,8 @@ import net.minecraft.network.chat.contents.LiteralContents; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; -import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket; +import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket; +import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket; import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket; import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket; import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket; @@ -1201,14 +1203,29 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); ServerPlayer entity = ((CraftPlayer) listPlayer).getHandle(); - NMSImpl.sendPacket(recipient, - new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, entity)); + ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket( + ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, entity); + + boolean list = entity instanceof NPCHolder + ? !((NPCHolder) entity).getNPC().data().get("removefromtablist", Setting.DISABLE_TABLIST.asBoolean()) + : false; + ClientboundPlayerInfoUpdatePacket.Entry entry = new ClientboundPlayerInfoUpdatePacket.Entry(entity.getUUID(), + entity.getGameProfile(), list, entity.latency, entity.gameMode.getGameModeForPlayer(), + entity.getTabListDisplayName(), + entity.getChatSession() == null ? null : entity.getChatSession().asData()); + try { + PLAYERINFO_ENTRIES.invoke(packet, Lists.newArrayList(entry)); + } catch (Throwable e) { + e.printStackTrace(); + } + NMSImpl.sendPacket(recipient, packet); + return false; } @Override @@ -1223,8 +1240,8 @@ public class NMSImpl implements NMSBridge { i++; } - NMSImpl.sendPacket(recipient, - new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, entities)); + NMSImpl.sendPacket(recipient, new ClientboundPlayerInfoRemovePacket( + skinnableNPCs.stream().map(e -> ((ServerPlayer) e).getUUID()).collect(Collectors.toList()))); } @Override @@ -1234,8 +1251,7 @@ public class NMSImpl implements NMSBridge { ServerPlayer entity = ((CraftPlayer) listPlayer).getHandle(); - NMSImpl.sendPacket(recipient, - new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, entity)); + NMSImpl.sendPacket(recipient, new ClientboundPlayerInfoRemovePacket(Arrays.asList(entity.getUUID()))); } @Override @@ -2032,7 +2048,7 @@ public class NMSImpl implements NMSBridge { public static SoundEvent getSoundEffect(NPC npc, SoundEvent snd, String meta) { return npc == null || !npc.data().has(meta) ? snd - : Registry.SOUND_EVENT + : BuiltInRegistries.SOUND_EVENT .get(new ResourceLocation(npc.data().get(meta, snd == null ? "" : snd.toString()))); } @@ -2067,7 +2083,7 @@ public class NMSImpl implements NMSBridge { int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0); minecart.setCustomDisplay(mat != null); if (mat != null) { - minecart.setDisplayBlockState(Registry.BLOCK.byId(mat.getId()).defaultBlockState()); + minecart.setDisplayBlockState(BuiltInRegistries.BLOCK.byId(mat.getId()).defaultBlockState()); } minecart.setDisplayOffset(offset); } @@ -2290,7 +2306,8 @@ public class NMSImpl implements NMSBridge { } } - private static final MethodHandle ADVANCEMENTS_PLAYER_FIELD = NMS.getFinalSetter(ServerPlayer.class, "cr"); + private static final MethodHandle ADVANCEMENTS_PLAYER_FIELD = NMS.getFinalSetter(ServerPlayer.class, "cq"); + private static final Set BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.BEE, EntityType.SILVERFISH, EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME, EntityType.DOLPHIN, EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST, @@ -2331,11 +2348,13 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle NAVIGATION_CREATE_PATHFINDER = NMS .getFirstMethodHandleWithReturnType(PathNavigation.class, true, PathFinder.class, int.class); private static MethodHandle NAVIGATION_PATH = NMS.getFirstGetter(PathNavigation.class, Path.class); - private static final MethodHandle NAVIGATION_PATHFINDER = NMS.getFinalSetter(PathNavigation.class, "t"); + private static final MethodHandle NAVIGATION_PATHFINDER = NMS.getFinalSetter(PathNavigation.class, "v"); private static final MethodHandle NAVIGATION_WORLD_FIELD = NMS.getFirstSetter(PathNavigation.class, Level.class); public static final Location PACKET_CACHE_LOCATION = new Location(null, 0, 0, 0); - private static final MethodHandle PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER = NMS.getGetter(ChunkMap.class, "O"); - private static final MethodHandle PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER = NMS.getSetter(ChunkMap.class, "O"); + private static final MethodHandle PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER = NMS.getGetter(ChunkMap.class, "P"); + private static final MethodHandle PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER = NMS.getSetter(ChunkMap.class, "P"); + private static final MethodHandle PLAYERINFO_ENTRIES = NMS.getFinalSetter(ClientboundPlayerInfoUpdatePacket.class, + "b"); private static MethodHandle PORTAL_ENTRANCE_POS_GETTER = NMS.getGetter(Entity.class, "ai"); private static MethodHandle PORTAL_ENTRANCE_POS_SETTER = NMS.getSetter(Entity.class, "ai"); private static final MethodHandle PUFFERFISH_C = NMS.getSetter(Pufferfish.class, "bX"); @@ -2349,8 +2368,8 @@ public class NMSImpl implements NMSBridge { static { try { - ENTITY_REGISTRY = new CustomEntityRegistry(Registry.ENTITY_TYPE); - ENTITY_REGISTRY_SETTER = NMS.getFinalSetter(Registry.class, "X"); + ENTITY_REGISTRY = new CustomEntityRegistry(BuiltInRegistries.ENTITY_TYPE); + ENTITY_REGISTRY_SETTER = NMS.getFinalSetter(BuiltInRegistries.class, "h"); ENTITY_REGISTRY_SETTER.invoke(ENTITY_REGISTRY); } catch (Throwable e) { Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage()); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerAnimationImpl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerAnimationImpl.java similarity index 90% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerAnimationImpl.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerAnimationImpl.java index 1b18d922f..3039c6ec5 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerAnimationImpl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerAnimationImpl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.util.Map; @@ -23,7 +23,7 @@ public class PlayerAnimationImpl { switch (animation) { case SNEAK: player.getBukkitEntity().setSneaking(true); - sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData(), true), + sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData().packDirty()), player, radius); break; case START_ELYTRA: @@ -34,22 +34,22 @@ public class PlayerAnimationImpl { break; case START_USE_MAINHAND_ITEM: player.startUsingItem(InteractionHand.MAIN_HAND); - sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData(), true), + sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData().packDirty()), player, radius); break; case START_USE_OFFHAND_ITEM: player.startUsingItem(InteractionHand.OFF_HAND); - sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData(), true), + sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData().packDirty()), player, radius); break; case STOP_SNEAKING: player.getBukkitEntity().setSneaking(false); - sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData(), true), + sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData().packDirty()), player, radius); break; case STOP_USE_ITEM: player.stopUsingItem(); - sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData(), true), + sendPacketNearby(new ClientboundSetEntityDataPacket(player.getId(), player.getEntityData().packDirty()), player, radius); break; default: diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerControllerJump.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerControllerJump.java similarity index 77% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerControllerJump.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerControllerJump.java index 0139f7c5e..32268d2ff 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerControllerJump.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerControllerJump.java @@ -1,6 +1,6 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; public class PlayerControllerJump { private boolean a; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerMoveControl.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java similarity index 97% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerMoveControl.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java index 92455ac2e..f78541a63 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerMoveControl.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerMoveControl.java @@ -1,8 +1,8 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.util.Random; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; import net.citizensnpcs.util.NMS; import net.minecraft.util.Mth; import net.minecraft.world.entity.EntityType; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java similarity index 99% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java index c51b74ece..4ff04c627 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNavigation.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNavigation.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.util.Set; import java.util.stream.Collectors; @@ -7,7 +7,7 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableSet; import net.citizensnpcs.Settings; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; import net.minecraft.tags.BlockTags; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNodeEvaluator.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNodeEvaluator.java similarity index 99% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNodeEvaluator.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNodeEvaluator.java index 84f39957d..39a57b79a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNodeEvaluator.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNodeEvaluator.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.util.EnumSet; @@ -7,7 +7,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2BooleanMap; import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; import net.citizensnpcs.Settings.Setting; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.tags.BlockTags; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNodeEvaluatorBase.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNodeEvaluatorBase.java similarity index 95% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNodeEvaluatorBase.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNodeEvaluatorBase.java index ddac447c1..727cc20c5 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerNodeEvaluatorBase.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerNodeEvaluatorBase.java @@ -1,8 +1,8 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.entity.Mob; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerPathfinder.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerPathfinder.java similarity index 98% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerPathfinder.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerPathfinder.java index c3640573b..a80f01fbf 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerPathfinder.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerPathfinder.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.util.Comparator; import java.util.List; @@ -13,7 +13,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import net.citizensnpcs.Settings.Setting; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; import net.minecraft.core.BlockPos; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.util.profiling.metrics.MetricCategory; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerlistTracker.java b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerlistTracker.java similarity index 89% rename from v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerlistTracker.java rename to v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerlistTracker.java index e50ead465..c7217e51e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/PlayerlistTracker.java +++ b/v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/PlayerlistTracker.java @@ -1,13 +1,12 @@ -package net.citizensnpcs.nms.v1_19_R1.util; +package net.citizensnpcs.nms.v1_19_R2.util; import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; -import net.citizensnpcs.nms.v1_19_R1.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_19_R2.entity.EntityHumanNPC; import net.citizensnpcs.util.NMS; import net.minecraft.network.protocol.game.ClientboundAnimatePacket; import net.minecraft.server.level.ChunkMap; @@ -36,15 +35,12 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity { if (entityplayer == null) return; NMS.sendTabListAdd(entityplayer.getBukkitEntity(), (Player) tracker.getBukkitEntity()); - if (!Setting.DISABLE_TABLIST.asBoolean()) - return; Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() { @Override public void run() { NMSImpl.sendPacket(entityplayer.getBukkitEntity(), new ClientboundAnimatePacket(tracker, 0)); - NMS.sendTabListRemove(entityplayer.getBukkitEntity(), (Player) tracker.getBukkitEntity()); } - }, Setting.TABLIST_REMOVE_PACKET_DELAY.asInt()); + }, 1); } @Override diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index 1de4c3710..48cdf5189 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java @@ -924,7 +924,7 @@ public class NMSImpl implements NMSBridge { } @Override - public void sendTabListAdd(Player recipient, Player listPlayer) { + public boolean sendTabListAdd(Player recipient, Player listPlayer) { Preconditions.checkNotNull(recipient); Preconditions.checkNotNull(listPlayer); @@ -932,6 +932,7 @@ public class NMSImpl implements NMSBridge { NMSImpl.sendPacket(recipient, new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entity)); + return true; } @Override