From baa629a1e00b79b001d94616757aa48a5b3a5296 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 4 Dec 2024 21:41:23 +0800 Subject: [PATCH] Update to 1.21.4 --- dist/pom.xml | 8 +- main/pom.xml | 4 +- pom.xml | 8 +- v1_10_R1/pom.xml | 2 +- v1_11_R1/pom.xml | 2 +- v1_12_R1/pom.xml | 2 +- v1_13_R2/pom.xml | 2 +- v1_14_R1/pom.xml | 2 +- v1_15_R1/pom.xml | 2 +- v1_16_R3/pom.xml | 2 +- v1_17_R1/pom.xml | 2 +- v1_18_R2/pom.xml | 2 +- v1_19_R3/pom.xml | 2 +- v1_20_R4/pom.xml | 2 +- .../entity/CreakingTransientController.java | 250 -------------- {v1_21_R2 => v1_21_R3}/pom.xml | 6 +- .../nms/v1_21_R3}/entity/AllayController.java | 18 +- .../v1_21_R3}/entity/ArmadilloController.java | 18 +- .../entity/ArmorStandController.java | 22 +- .../v1_21_R3}/entity/AxolotlController.java | 18 +- .../nms/v1_21_R3}/entity/BatController.java | 18 +- .../nms/v1_21_R3}/entity/BeeController.java | 18 +- .../nms/v1_21_R3}/entity/BlazeController.java | 18 +- .../v1_21_R3}/entity/BoggedController.java | 18 +- .../v1_21_R3}/entity/BreezeController.java | 18 +- .../nms/v1_21_R3}/entity/CamelController.java | 18 +- .../nms/v1_21_R3}/entity/CatController.java | 18 +- .../entity/CaveSpiderController.java | 18 +- .../v1_21_R3}/entity/ChickenController.java | 18 +- .../nms/v1_21_R3}/entity/CodController.java | 18 +- .../nms/v1_21_R3}/entity/CowController.java | 18 +- .../v1_21_R3}/entity/CreakingController.java | 18 +- .../v1_21_R3}/entity/CreeperController.java | 18 +- .../v1_21_R3}/entity/DolphinController.java | 18 +- .../v1_21_R3}/entity/DrownedController.java | 18 +- .../entity/EnderDragonController.java | 18 +- .../v1_21_R3}/entity/EndermanController.java | 18 +- .../v1_21_R3}/entity/EndermiteController.java | 18 +- .../nms/v1_21_R3}/entity/EntityHumanNPC.java | 20 +- .../v1_21_R3}/entity/EvokerController.java | 18 +- .../nms/v1_21_R3}/entity/FoxController.java | 18 +- .../nms/v1_21_R3}/entity/FrogController.java | 18 +- .../nms/v1_21_R3}/entity/GhastController.java | 18 +- .../nms/v1_21_R3}/entity/GiantController.java | 18 +- .../v1_21_R3}/entity/GlowSquidController.java | 18 +- .../nms/v1_21_R3}/entity/GoatController.java | 18 +- .../v1_21_R3}/entity/GuardianController.java | 18 +- .../entity/GuardianElderController.java | 18 +- .../v1_21_R3}/entity/HoglinController.java | 18 +- .../nms/v1_21_R3}/entity/HorseController.java | 18 +- .../entity/HorseDonkeyController.java | 18 +- .../v1_21_R3}/entity/HorseMuleController.java | 18 +- .../entity/HorseSkeletonController.java | 18 +- .../entity/HorseZombieController.java | 18 +- .../nms/v1_21_R3}/entity/HumanController.java | 4 +- .../entity/IllusionerController.java | 18 +- .../v1_21_R3}/entity/IronGolemController.java | 18 +- .../nms/v1_21_R3}/entity/LlamaController.java | 18 +- .../v1_21_R3}/entity/MagmaCubeController.java | 20 +- .../v1_21_R3}/entity/MobEntityController.java | 8 +- .../entity/MushroomCowController.java | 18 +- .../v1_21_R3}/entity/OcelotController.java | 18 +- .../nms/v1_21_R3}/entity/PandaController.java | 18 +- .../v1_21_R3}/entity/ParrotController.java | 18 +- .../v1_21_R3}/entity/PhantomController.java | 20 +- .../nms/v1_21_R3}/entity/PigController.java | 18 +- .../v1_21_R3}/entity/PigZombieController.java | 18 +- .../entity/PiglinBruteController.java | 18 +- .../v1_21_R3}/entity/PiglinController.java | 18 +- .../v1_21_R3}/entity/PillagerController.java | 18 +- .../v1_21_R3}/entity/PolarBearController.java | 18 +- .../entity/PufferFishController.java | 20 +- .../v1_21_R3}/entity/RabbitController.java | 18 +- .../v1_21_R3}/entity/RavagerController.java | 18 +- .../v1_21_R3}/entity/SalmonController.java | 20 +- .../nms/v1_21_R3}/entity/SheepController.java | 18 +- .../v1_21_R3}/entity/ShulkerController.java | 18 +- .../entity/SilverfishController.java | 18 +- .../v1_21_R3}/entity/SkeletonController.java | 18 +- .../entity/SkeletonStrayController.java | 18 +- .../entity/SkeletonWitherController.java | 18 +- .../nms/v1_21_R3}/entity/SlimeController.java | 20 +- .../v1_21_R3}/entity/SnifferController.java | 18 +- .../v1_21_R3}/entity/SnowmanController.java | 18 +- .../v1_21_R3}/entity/SpiderController.java | 18 +- .../nms/v1_21_R3}/entity/SquidController.java | 18 +- .../v1_21_R3}/entity/StriderController.java | 18 +- .../v1_21_R3}/entity/TadpoleController.java | 20 +- .../entity/TraderLlamaController.java | 18 +- .../entity/TropicalFishController.java | 20 +- .../v1_21_R3}/entity/TurtleController.java | 20 +- .../nms/v1_21_R3}/entity/VexController.java | 18 +- .../v1_21_R3}/entity/VillagerController.java | 18 +- .../entity/VindicatorController.java | 18 +- .../entity/WanderingTraderController.java | 18 +- .../v1_21_R3}/entity/WardenController.java | 18 +- .../nms/v1_21_R3}/entity/WitchController.java | 18 +- .../v1_21_R3}/entity/WitherController.java | 18 +- .../nms/v1_21_R3}/entity/WolfController.java | 18 +- .../v1_21_R3}/entity/ZoglinController.java | 18 +- .../v1_21_R3}/entity/ZombieController.java | 18 +- .../entity/ZombieHuskController.java | 18 +- .../entity/ZombieVillagerController.java | 18 +- .../nonliving/AreaEffectCloudController.java | 20 +- .../nonliving/BlockDisplayController.java | 22 +- .../entity/nonliving/BoatController.java | 20 +- .../nonliving/BreezeWindChargeController.java | 20 +- .../entity/nonliving/ChestBoatController.java | 20 +- .../entity/nonliving/ChestRaftController.java | 20 +- .../nonliving/DragonFireballController.java | 20 +- .../entity/nonliving/EggController.java | 20 +- .../nonliving/EnderCrystalController.java | 20 +- .../nonliving/EnderPearlController.java | 20 +- .../nonliving/EvokerFangsController.java | 20 +- .../nonliving/ExperienceOrbController.java | 20 +- .../nonliving/EyeOfEnderController.java | 20 +- .../nonliving/FallingBlockController.java | 20 +- .../entity/nonliving/FireworkController.java | 20 +- .../nonliving/FishingHookController.java | 22 +- .../nonliving/GlowItemFrameController.java | 18 +- .../nonliving/InteractionController.java | 20 +- .../entity/nonliving/ItemController.java | 20 +- .../nonliving/ItemDisplayController.java | 24 +- .../entity/nonliving/ItemFrameController.java | 18 +- .../nonliving/LargeFireballController.java | 20 +- .../entity/nonliving/LeashController.java | 20 +- .../entity/nonliving/LlamaSpitController.java | 20 +- .../entity/nonliving/MarkerController.java | 20 +- .../nonliving/MinecartChestController.java | 20 +- .../nonliving/MinecartCommandController.java | 20 +- .../nonliving/MinecartFurnaceController.java | 20 +- .../nonliving/MinecartHopperController.java | 12 +- .../nonliving/MinecartRideableController.java | 20 +- .../nonliving/MinecartSpawnerController.java | 12 +- .../nonliving/MinecartTNTController.java | 12 +- .../OminousItemSpawnerController.java | 22 +- .../entity/nonliving/PaintingController.java | 20 +- .../entity/nonliving/RaftController.java | 20 +- .../nonliving/ShulkerBulletController.java | 20 +- .../nonliving/SmallFireballController.java | 20 +- .../entity/nonliving/SnowballController.java | 20 +- .../nonliving/SpectralArrowController.java | 20 +- .../entity/nonliving/TNTPrimedController.java | 20 +- .../nonliving/TextDisplayController.java | 20 +- .../nonliving/ThrownExpBottleController.java | 20 +- .../nonliving/ThrownPotionController.java | 20 +- .../nonliving/ThrownTridentController.java | 20 +- .../nonliving/TippedArrowController.java | 20 +- .../nonliving/WindChargeController.java | 20 +- .../nonliving/WitherSkullController.java | 20 +- .../v1_21_R3}/network/EmptyConnection.java | 4 +- .../network/EmptyPacketListener.java | 2 +- .../v1_21_R3}/util/CitizensBlockBreaker.java | 4 +- .../v1_21_R3}/util/CitizensEntityTracker.java | 4 +- .../v1_21_R3}/util/CustomEntityRegistry.java | 2 +- .../util/EmptyAdvancementDataPlayer.java | 2 +- .../util/EmptyServerStatsCounter.java | 2 +- .../nms/v1_21_R3}/util/EntityJumpControl.java | 2 +- .../nms/v1_21_R3}/util/EntityMoveControl.java | 2 +- .../nms/v1_21_R3}/util/EntityNavigation.java | 2 +- .../v1_21_R3}/util/EntityNodeEvaluator.java | 2 +- .../util/EntityNodeEvaluatorBase.java | 2 +- .../nms/v1_21_R3}/util/EntityPathfinder.java | 2 +- .../util/EntityPathfindingContext.java | 4 +- .../v1_21_R3}/util/ForwardingNPCHolder.java | 2 +- .../nms/v1_21_R3}/util/MobAI.java | 2 +- .../nms/v1_21_R3}/util/NMSBoundingBox.java | 2 +- .../nms/v1_21_R3}/util/NMSImpl.java | 321 +++++++++--------- .../v1_21_R3}/util/PitchableLookControl.java | 2 +- .../v1_21_R3}/util/PlayerAnimationImpl.java | 2 +- v1_8_R3/pom.xml | 2 +- 171 files changed, 1451 insertions(+), 1702 deletions(-) delete mode 100644 v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingTransientController.java rename {v1_21_R2 => v1_21_R3}/pom.xml (96%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/AllayController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ArmadilloController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ArmorStandController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/AxolotlController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/BatController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/BeeController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/BlazeController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/BoggedController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/BreezeController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CamelController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CatController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CaveSpiderController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ChickenController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CodController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CowController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CreakingController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/CreeperController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/DolphinController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/DrownedController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/EnderDragonController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/EndermanController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/EndermiteController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/EntityHumanNPC.java (96%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/EvokerController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/FoxController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/FrogController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/GhastController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/GiantController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/GlowSquidController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/GoatController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/GuardianController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/GuardianElderController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HoglinController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HorseController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HorseDonkeyController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HorseMuleController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HorseSkeletonController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HorseZombieController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/HumanController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/IllusionerController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/IronGolemController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/LlamaController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/MagmaCubeController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/MobEntityController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/MushroomCowController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/OcelotController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PandaController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ParrotController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PhantomController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PigController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PigZombieController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PiglinBruteController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PiglinController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PillagerController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PolarBearController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/PufferFishController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/RabbitController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/RavagerController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SalmonController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SheepController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ShulkerController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SilverfishController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SkeletonController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SkeletonStrayController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SkeletonWitherController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SlimeController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SnifferController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SnowmanController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SpiderController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/SquidController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/StriderController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/TadpoleController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/TraderLlamaController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/TropicalFishController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/TurtleController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/VexController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/VillagerController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/VindicatorController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/WanderingTraderController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/WardenController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/WitchController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/WitherController.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/WolfController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ZoglinController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ZombieController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ZombieHuskController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/ZombieVillagerController.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/AreaEffectCloudController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/BlockDisplayController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/BoatController.java (96%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/BreezeWindChargeController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ChestBoatController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ChestRaftController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/DragonFireballController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/EggController.java (90%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/EnderCrystalController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/EnderPearlController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/EvokerFangsController.java (90%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ExperienceOrbController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/EyeOfEnderController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/FallingBlockController.java (91%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/FireworkController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/FishingHookController.java (90%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/GlowItemFrameController.java (91%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/InteractionController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ItemController.java (90%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ItemDisplayController.java (87%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ItemFrameController.java (91%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/LargeFireballController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/LeashController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/LlamaSpitController.java (90%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MarkerController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartChestController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartCommandController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartFurnaceController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartHopperController.java (92%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartRideableController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartSpawnerController.java (92%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/MinecartTNTController.java (92%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/OminousItemSpawnerController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/PaintingController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/RaftController.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ShulkerBulletController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/SmallFireballController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/SnowballController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/SpectralArrowController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/TNTPrimedController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/TextDisplayController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ThrownExpBottleController.java (89%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ThrownPotionController.java (90%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/ThrownTridentController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/TippedArrowController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/WindChargeController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/entity/nonliving/WitherSkullController.java (88%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/network/EmptyConnection.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/network/EmptyPacketListener.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/CitizensBlockBreaker.java (97%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/CitizensEntityTracker.java (98%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/CustomEntityRegistry.java (99%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EmptyAdvancementDataPlayer.java (98%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EmptyServerStatsCounter.java (95%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityJumpControl.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityMoveControl.java (98%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityNavigation.java (99%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityNodeEvaluator.java (99%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityNodeEvaluatorBase.java (98%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityPathfinder.java (99%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/EntityPathfindingContext.java (97%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/ForwardingNPCHolder.java (93%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/MobAI.java (99%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/NMSBoundingBox.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/NMSImpl.java (92%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/PitchableLookControl.java (94%) rename {v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2 => v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3}/util/PlayerAnimationImpl.java (98%) diff --git a/dist/pom.xml b/dist/pom.xml index e60f38787..ca8ad7425 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -5,7 +5,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens pom @@ -84,7 +84,7 @@ ${project.groupId} - citizens-v1_21_R2 + citizens-v1_21_R3 ${project.version} jar compile @@ -187,7 +187,7 @@ ${project.groupId} - citizens-v1_21_R2 + citizens-v1_21_R3 ${project.version} jar compile @@ -206,7 +206,7 @@ ${project.groupId} - citizens-v1_21_R2 + citizens-v1_21_R3 ${project.version} jar compile diff --git a/main/pom.xml b/main/pom.xml index 1acf48968..c1bfe0705 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -6,12 +6,12 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-main UTF-8 - 1.21.3-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT 2.11.5 ${project.version} 7.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index ccb78ca68..ce3ea608e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pom net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT Unknown 2.0.36 @@ -43,7 +43,7 @@ main v1_19_R3 v1_20_R4 - v1_21_R2 + v1_21_R3 dist @@ -63,7 +63,7 @@ v1_18_R2 v1_19_R3 v1_20_R4 - v1_21_R2 + v1_21_R3 dist @@ -71,7 +71,7 @@ dev main - v1_21_R2 + v1_21_R3 dist diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml index 641f6c753..c37df097d 100644 --- a/v1_10_R1/pom.xml +++ b/v1_10_R1/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_10_R1 diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml index 299fd0e9e..cd25165d2 100644 --- a/v1_11_R1/pom.xml +++ b/v1_11_R1/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_11_R1 diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml index ffc10aee1..7e50abde2 100644 --- a/v1_12_R1/pom.xml +++ b/v1_12_R1/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_12_R1 diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml index 7a357e7ba..eadab27b9 100644 --- a/v1_13_R2/pom.xml +++ b/v1_13_R2/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_13_R2 diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml index 6822f1672..67aeff013 100644 --- a/v1_14_R1/pom.xml +++ b/v1_14_R1/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_14_R1 diff --git a/v1_15_R1/pom.xml b/v1_15_R1/pom.xml index 4481a6b1b..775c0aabe 100644 --- a/v1_15_R1/pom.xml +++ b/v1_15_R1/pom.xml @@ -4,7 +4,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_15_R1 diff --git a/v1_16_R3/pom.xml b/v1_16_R3/pom.xml index 0635c14c5..509039125 100644 --- a/v1_16_R3/pom.xml +++ b/v1_16_R3/pom.xml @@ -4,7 +4,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_16_R3 diff --git a/v1_17_R1/pom.xml b/v1_17_R1/pom.xml index 45c523b23..19315bbd5 100644 --- a/v1_17_R1/pom.xml +++ b/v1_17_R1/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_17_R1 diff --git a/v1_18_R2/pom.xml b/v1_18_R2/pom.xml index 2d77356fa..d7d1531f5 100644 --- a/v1_18_R2/pom.xml +++ b/v1_18_R2/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_18_R2 diff --git a/v1_19_R3/pom.xml b/v1_19_R3/pom.xml index 0a1ff3ad6..33e4ec74b 100644 --- a/v1_19_R3/pom.xml +++ b/v1_19_R3/pom.xml @@ -4,7 +4,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_19_R3 diff --git a/v1_20_R4/pom.xml b/v1_20_R4/pom.xml index ec40aebef..8896220d4 100644 --- a/v1_20_R4/pom.xml +++ b/v1_20_R4/pom.xml @@ -4,7 +4,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_20_R4 diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingTransientController.java b/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingTransientController.java deleted file mode 100644 index e9fef9777..000000000 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingTransientController.java +++ /dev/null @@ -1,250 +0,0 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; - -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCreakingTransient; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; - -import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; -import net.citizensnpcs.npc.CitizensNPC; -import net.citizensnpcs.npc.ai.NPCHolder; -import net.citizensnpcs.util.NMS; -import net.citizensnpcs.util.Util; -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.tags.TagKey; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.monster.creaking.CreakingTransient; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.vehicle.AbstractMinecart; -import net.minecraft.world.entity.vehicle.Boat; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.PushReaction; -import net.minecraft.world.level.portal.TeleportTransition; -import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.Vec3; - -public class CreakingTransientController extends MobEntityController { - public CreakingTransientController() { - super(EntityCreakingTransientNPC.class, EntityType.CREAKING_TRANSIENT); - } - - @Override - public org.bukkit.entity.CreakingTransient getBukkitEntity() { - return (org.bukkit.entity.CreakingTransient) super.getBukkitEntity(); - } - - public static class CreakingTransientNPC extends CraftCreakingTransient implements ForwardingNPCHolder { - public CreakingTransientNPC(EntityCreakingTransientNPC entity) { - super((CraftServer) Bukkit.getServer(), entity); - } - } - - public static class EntityCreakingTransientNPC extends CreakingTransient implements NPCHolder { - private final CitizensNPC npc; - - public EntityCreakingTransientNPC(EntityType types, Level level) { - this(types, level, null); - } - - public EntityCreakingTransientNPC(EntityType types, Level level, NPC npc) { - super(types, level); - this.npc = (CitizensNPC) npc; - } - - @Override - public boolean broadcastToPlayer(ServerPlayer player) { - return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player)); - } - - @Override - protected boolean canRide(Entity entity) { - if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) - return !npc.isProtected(); - return super.canRide(entity); - } - - @Override - public boolean causeFallDamage(float f, float f1, DamageSource damagesource) { - if (npc == null || !npc.isFlyable()) - return super.causeFallDamage(f, f1, damagesource); - return false; - } - - @Override - public void checkDespawn() { - if (npc == null) { - super.checkDespawn(); - } - } - - @Override - protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, BlockPos blockposition) { - if (npc == null || !npc.isFlyable()) { - super.checkFallDamage(d0, flag, iblockdata, blockposition); - } - } - - @Override - public void customServerAiStep(ServerLevel level) { - super.customServerAiStep(level); - if (npc != null) { - NMSImpl.updateMinecraftAIState(npc, this); - npc.update(); - if (npc.isProtected()) { - NMSImpl.setScuteTime(this, 2); - } - } - } - - @Override - protected SoundEvent getAmbientSound() { - return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); - } - - @Override - public CraftEntity getBukkitEntity() { - if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { - NMSImpl.setBukkitEntity(this, new CreakingTransientNPC(this)); - } - return super.getBukkitEntity(); - } - - @Override - protected SoundEvent getDeathSound() { - return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND); - } - - @Override - protected SoundEvent getHurtSound(DamageSource damagesource) { - return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); - } - - @Override - public float getJumpPower() { - return NMS.getJumpPower(npc, super.getJumpPower()); - } - - @Override - public int getMaxFallDistance() { - return NMS.getFallDistance(npc, super.getMaxFallDistance()); - } - - @Override - public NPC getNPC() { - return npc; - } - - @Override - public PushReaction getPistonPushReaction() { - return Util.callPistonPushEvent(npc) ? PushReaction.IGNORE : super.getPistonPushReaction(); - } - - @Override - public boolean isLeashed() { - return NMSImpl.isLeashed(npc, super::isLeashed, this); - } - - @Override - public boolean isPushable() { - return npc == null ? super.isPushable() - : npc.data(). get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); - } - - @Override - public void knockback(double strength, double dx, double dz) { - NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(), - evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ())); - } - - @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); - } - - @Override - public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) { - if (npc == null || !npc.isProtected()) - return super.mobInteract(entityhuman, enumhand); - ItemStack itemstack = entityhuman.getItemInHand(enumhand); - if (itemstack.getItem() == Items.BRUSH) - return InteractionResult.FAIL; - return super.mobInteract(entityhuman, enumhand); - } - - @Override - public boolean onClimbable() { - if (npc == null || !npc.isFlyable()) - return super.onClimbable(); - else - return false; - } - - @Override - public void onSyncedDataUpdated(EntityDataAccessor datawatcherobject) { - if (npc == null) { - super.onSyncedDataUpdated(datawatcherobject); - return; - } - NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated); - } - - @Override - public void push(Entity entity) { - // this method is called by both the entities involved - cancelling - // it will not stop the NPC from moving. - super.push(entity); - if (npc != null) { - Util.callCollisionEvent(npc, entity.getBukkitEntity()); - } - } - - @Override - public boolean save(CompoundTag save) { - return npc == null ? super.save(save) : false; - } - - @Override - public Entity teleport(TeleportTransition transition) { - if (npc == null) - return super.teleport(transition); - return NMSImpl.teleportAcrossWorld(this, transition); - } - - @Override - public void travel(Vec3 vec3d) { - if (npc == null || !npc.isFlyable()) { - super.travel(vec3d); - } else { - NMSImpl.moveLogic(this, vec3d); - } - } - - @Override - public boolean updateFluidHeightAndDoFluidPushing(TagKey tagkey, double d0) { - if (npc == null) - return super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - Vec3 old = getDeltaMovement().add(0, 0, 0); - boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0); - if (!npc.isPushableByFluids()) { - setDeltaMovement(old); - } - return res; - } - } -} diff --git a/v1_21_R2/pom.xml b/v1_21_R3/pom.xml similarity index 96% rename from v1_21_R2/pom.xml rename to v1_21_R3/pom.xml index f3604b95f..3c629b8e1 100644 --- a/v1_21_R2/pom.xml +++ b/v1_21_R3/pom.xml @@ -4,12 +4,12 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT - citizens-v1_21_R2 + citizens-v1_21_R3 UTF-8 - 1.21.3-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AllayController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AllayController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AllayController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AllayController.java index 7aaae632a..3df3889b8 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AllayController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AllayController.java @@ -1,18 +1,18 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftAllay; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftAllay; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import com.google.common.collect.Lists; import com.mojang.datafixers.util.Pair; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -174,8 +174,8 @@ public class AllayController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmadilloController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmadilloController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmadilloController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmadilloController.java index a51ec8225..264e0786f 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmadilloController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmadilloController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftArmadillo; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftArmadillo; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -173,8 +173,8 @@ public class ArmadilloController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmorStandController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmorStandController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmorStandController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmorStandController.java index f9007c19c..74de39087 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmorStandController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmorStandController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftArmorStand; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import org.bukkit.event.player.PlayerInteractEntityEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.MobAI; -import net.citizensnpcs.nms.v1_21_R2.util.MobAI.ForwardingMobAI; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.MobAI; +import net.citizensnpcs.nms.v1_21_R3.util.MobAI.ForwardingMobAI; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -104,8 +104,8 @@ public class ArmorStandController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AxolotlController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AxolotlController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AxolotlController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AxolotlController.java index 79ede8e5f..775bf8039 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AxolotlController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AxolotlController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftAxolotl; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftAxolotl; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -169,8 +169,8 @@ public class AxolotlController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BatController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BatController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BatController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BatController.java index de3f66594..c8edff9be 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BatController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BatController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBat; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBat; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -155,8 +155,8 @@ public class BatController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BeeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BeeController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BeeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BeeController.java index 6bdb7c558..cfd58c402 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BeeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BeeController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBee; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBee; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -152,8 +152,8 @@ public class BeeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BlazeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BlazeController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BlazeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BlazeController.java index e9dc7a411..22c03c8d1 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BlazeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BlazeController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBlaze; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -147,8 +147,8 @@ public class BlazeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BoggedController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BoggedController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BoggedController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BoggedController.java index 242cacdc6..db9b68158 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BoggedController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BoggedController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBogged; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBogged; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -165,8 +165,8 @@ public class BoggedController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BreezeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BreezeController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BreezeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BreezeController.java index 078db7139..2f425fc1e 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BreezeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BreezeController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBreeze; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBreeze; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -165,8 +165,8 @@ public class BreezeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CamelController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CamelController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CamelController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CamelController.java index b89d15417..d71e82a88 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CamelController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CamelController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCamel; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCamel; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -210,8 +210,8 @@ public class CamelController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CatController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CatController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CatController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CatController.java index 420cefd62..e303fd979 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CatController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CatController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCat; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCat; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -165,8 +165,8 @@ public class CatController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CaveSpiderController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CaveSpiderController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CaveSpiderController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CaveSpiderController.java index 239b6cfbd..fb0d2aa1c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CaveSpiderController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CaveSpiderController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCaveSpider; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -164,8 +164,8 @@ public class CaveSpiderController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ChickenController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ChickenController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ChickenController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ChickenController.java index edc6b8308..ee7f3cefe 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ChickenController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ChickenController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftChicken; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -173,8 +173,8 @@ public class ChickenController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CodController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CodController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CodController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CodController.java index 7af2bdc02..4b1641dd2 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CodController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CodController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCod; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCod; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -199,8 +199,8 @@ public class CodController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CowController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CowController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CowController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CowController.java index 0b36bb1e8..127461fad 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CowController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CowController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCow; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCow; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -170,8 +170,8 @@ public class CowController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreakingController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreakingController.java index 3012f90b5..c92ab90d9 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreakingController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCreaking; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCreaking; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -173,8 +173,8 @@ public class CreakingController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreeperController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreeperController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreeperController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreeperController.java index 857774aee..dc1e01e7a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreeperController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreeperController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCreeper; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -174,8 +174,8 @@ public class CreeperController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DolphinController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DolphinController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DolphinController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DolphinController.java index a1e928bdf..b514517bd 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DolphinController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DolphinController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDolphin; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDolphin; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -170,8 +170,8 @@ public class DolphinController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DrownedController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DrownedController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DrownedController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DrownedController.java index 0c062cf8a..0f15292f4 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DrownedController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DrownedController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDrowned; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDrowned; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -164,8 +164,8 @@ public class DrownedController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EnderDragonController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EnderDragonController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EnderDragonController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EnderDragonController.java index f54967bb2..05a087d8a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EnderDragonController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EnderDragonController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderDragon; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.versioned.EnderDragonTrait; @@ -215,8 +215,8 @@ public class EnderDragonController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermanController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermanController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermanController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermanController.java index 2a607d2f4..26e68bddf 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermanController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermanController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import java.util.Optional; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderman; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import org.bukkit.event.player.PlayerTeleportEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -167,8 +167,8 @@ public class EndermanController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermiteController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermiteController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermiteController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermiteController.java index a8d7ce4d1..48decb48b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermiteController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermiteController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEndermite; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEndermite; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -164,8 +164,8 @@ public class EndermiteController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EntityHumanNPC.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EntityHumanNPC.java similarity index 96% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EntityHumanNPC.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EntityHumanNPC.java index e104ef98e..8923fa27d 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EntityHumanNPC.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EntityHumanNPC.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import java.io.IOException; import java.lang.invoke.MethodHandle; import java.util.List; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; @@ -19,13 +19,13 @@ import net.citizensnpcs.api.npc.NPC.NPCUpdate; import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.api.util.SpigotUtil; -import net.citizensnpcs.nms.v1_21_R2.network.EmptyConnection; -import net.citizensnpcs.nms.v1_21_R2.network.EmptyPacketListener; -import net.citizensnpcs.nms.v1_21_R2.util.EmptyAdvancementDataPlayer; -import net.citizensnpcs.nms.v1_21_R2.util.EmptyServerStatsCounter; -import net.citizensnpcs.nms.v1_21_R2.util.MobAI; -import net.citizensnpcs.nms.v1_21_R2.util.MobAI.ForwardingMobAI; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.network.EmptyConnection; +import net.citizensnpcs.nms.v1_21_R3.network.EmptyPacketListener; +import net.citizensnpcs.nms.v1_21_R3.util.EmptyAdvancementDataPlayer; +import net.citizensnpcs.nms.v1_21_R3.util.EmptyServerStatsCounter; +import net.citizensnpcs.nms.v1_21_R3.util.MobAI; +import net.citizensnpcs.nms.v1_21_R3.util.MobAI.ForwardingMobAI; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.skin.SkinPacketTracker; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EvokerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EvokerController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EvokerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EvokerController.java index 7c933f85a..03c97fa5c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EvokerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EvokerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEvoker; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEvoker; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class EvokerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FoxController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FoxController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FoxController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FoxController.java index ed0a383df..f690628de 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FoxController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FoxController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFox; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFox; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.versioned.FoxTrait; @@ -172,8 +172,8 @@ public class FoxController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FrogController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FrogController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FrogController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FrogController.java index 618e31db6..76f0092a1 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FrogController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FrogController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFrog; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFrog; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -162,8 +162,8 @@ public class FrogController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GhastController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GhastController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GhastController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GhastController.java index bfeb7aa50..66333962b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GhastController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GhastController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGhast; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -147,8 +147,8 @@ public class GhastController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GiantController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GiantController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GiantController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GiantController.java index 12b3b88a9..293e654ec 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GiantController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GiantController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGiant; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class GiantController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GlowSquidController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GlowSquidController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GlowSquidController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GlowSquidController.java index 8713533f0..a7b74cfd1 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GlowSquidController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GlowSquidController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGlowSquid; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGlowSquid; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class GlowSquidController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GoatController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GoatController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GoatController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GoatController.java index 709d59c64..1d8218f2e 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GoatController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GoatController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGoat; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGoat; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -159,8 +159,8 @@ public class GoatController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianController.java index 1a06cede9..77c622900 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGuardian; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGuardian; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -163,8 +163,8 @@ public class GuardianController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianElderController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianElderController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianElderController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianElderController.java index e5d90585c..ccac4e991 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianElderController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianElderController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftElderGuardian; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftElderGuardian; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -163,8 +163,8 @@ public class GuardianElderController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HoglinController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HoglinController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HoglinController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HoglinController.java index e8b21cf66..4b78ccff4 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HoglinController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HoglinController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftHoglin; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHoglin; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -164,8 +164,8 @@ public class HoglinController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseController.java index 0ee55e971..a05dd94eb 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHorse; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -203,8 +203,8 @@ public class HorseController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseDonkeyController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseDonkeyController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseDonkeyController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseDonkeyController.java index 553f247c4..768d55768 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseDonkeyController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseDonkeyController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDonkey; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDonkey; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -203,8 +203,8 @@ public class HorseDonkeyController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseMuleController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseMuleController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseMuleController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseMuleController.java index 48c1ddcf7..b7c317a04 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseMuleController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseMuleController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMule; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMule; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -203,8 +203,8 @@ public class HorseMuleController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseSkeletonController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseSkeletonController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseSkeletonController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseSkeletonController.java index 5b8f6ba5d..4c8053030 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseSkeletonController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseSkeletonController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSkeletonHorse; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSkeletonHorse; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -203,8 +203,8 @@ public class HorseSkeletonController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseZombieController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseZombieController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseZombieController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseZombieController.java index 6d6ee9e19..8d4a2015a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseZombieController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseZombieController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftZombieHorse; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftZombieHorse; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -203,8 +203,8 @@ public class HorseZombieController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HumanController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HumanController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HumanController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HumanController.java index 00b0378e6..6a85e7df7 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HumanController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HumanController.java @@ -1,8 +1,8 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; import java.util.UUID; +package net.citizensnpcs.nms.v1_21_R3.entity; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IllusionerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IllusionerController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IllusionerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IllusionerController.java index ed4f2aa3e..801f4b7c7 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IllusionerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IllusionerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftIllusioner; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftIllusioner; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class IllusionerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IronGolemController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IronGolemController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IronGolemController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IronGolemController.java index 7d924ea36..16284d4fe 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IronGolemController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IronGolemController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftIronGolem; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class IronGolemController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/LlamaController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/LlamaController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/LlamaController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/LlamaController.java index 94ebf940e..f1d4756ee 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/LlamaController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/LlamaController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftLlama; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftLlama; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; @@ -203,8 +203,8 @@ public class LlamaController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MagmaCubeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MagmaCubeController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MagmaCubeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MagmaCubeController.java index 118f0eba3..f1f494890 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MagmaCubeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MagmaCubeController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMagmaCube; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class MagmaCubeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MobEntityController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MobEntityController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MobEntityController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MobEntityController.java index 7d6689dc2..c4a3e344c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MobEntityController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MobEntityController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import java.lang.reflect.Constructor; import java.util.Map; @@ -6,13 +6,13 @@ import java.util.WeakHashMap; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; import org.bukkit.entity.Entity; import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; -import net.citizensnpcs.nms.v1_21_R2.util.PitchableLookControl; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.PitchableLookControl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.trait.ScoreboardTrait; import net.citizensnpcs.util.NMS; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MushroomCowController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MushroomCowController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MushroomCowController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MushroomCowController.java index d709af22c..f88c73558 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MushroomCowController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MushroomCowController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMushroomCow; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -162,8 +162,8 @@ public class MushroomCowController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/OcelotController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/OcelotController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/OcelotController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/OcelotController.java index f4a97d47b..bde6d14f0 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/OcelotController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/OcelotController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftOcelot; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -165,8 +165,8 @@ public class OcelotController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PandaController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PandaController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PandaController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PandaController.java index 58921ea52..697e9f05d 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PandaController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PandaController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPanda; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPanda; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -159,8 +159,8 @@ public class PandaController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ParrotController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ParrotController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ParrotController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ParrotController.java index 82058eddf..4c3c1015c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ParrotController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ParrotController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftParrot; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftParrot; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -153,8 +153,8 @@ public class ParrotController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PhantomController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PhantomController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PhantomController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PhantomController.java index 2d84f094f..be1afccec 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PhantomController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PhantomController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPhantom; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPhantom; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -188,8 +188,8 @@ public class PhantomController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigController.java index 7669f0391..c4062605b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPig; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPig; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -166,8 +166,8 @@ public class PigController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigZombieController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigZombieController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigZombieController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigZombieController.java index 0aa32f7be..535798469 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigZombieController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigZombieController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPigZombie; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class PigZombieController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinBruteController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinBruteController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinBruteController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinBruteController.java index 3367eeee1..eb6baed4c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinBruteController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinBruteController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPiglinBrute; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPiglinBrute; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -161,8 +161,8 @@ public class PiglinBruteController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinController.java index 6a03ed141..8c6042cd5 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPiglin; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPiglin; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -166,8 +166,8 @@ public class PiglinController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PillagerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PillagerController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PillagerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PillagerController.java index 08590237e..5bdc6b243 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PillagerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PillagerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPillager; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPillager; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -159,8 +159,8 @@ public class PillagerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PolarBearController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PolarBearController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PolarBearController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PolarBearController.java index f89117107..3debef929 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PolarBearController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PolarBearController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPolarBear; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPolarBear; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -143,8 +143,8 @@ public class PolarBearController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PufferFishController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PufferFishController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PufferFishController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PufferFishController.java index 4d586d5cd..33f793e98 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PufferFishController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PufferFishController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPufferFish; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPufferFish; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.versioned.PufferFishTrait; @@ -201,8 +201,8 @@ public class PufferFishController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RabbitController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RabbitController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RabbitController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RabbitController.java index 11211c440..f3bf7faa7 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RabbitController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RabbitController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftRabbit; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftRabbit; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -168,8 +168,8 @@ public class RabbitController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RavagerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RavagerController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RavagerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RavagerController.java index 389080d5d..edeab8ffd 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RavagerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RavagerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftRavager; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftRavager; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -164,8 +164,8 @@ public class RavagerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SalmonController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SalmonController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SalmonController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SalmonController.java index 63e1b344a..7a17a10a8 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SalmonController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SalmonController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSalmon; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSalmon; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -191,8 +191,8 @@ public class SalmonController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SheepController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SheepController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SheepController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SheepController.java index a64fbf008..bd6e68243 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SheepController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SheepController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSheep; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -159,8 +159,8 @@ public class SheepController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ShulkerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ShulkerController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ShulkerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ShulkerController.java index e135e4ccb..37edaf158 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ShulkerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ShulkerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftShulker; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftShulker; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -161,8 +161,8 @@ public class ShulkerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SilverfishController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SilverfishController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SilverfishController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SilverfishController.java index c9662c91d..8e91a479f 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SilverfishController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SilverfishController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSilverfish; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SilverfishController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonController.java index 76dc1e395..b322d4abd 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSkeleton; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SkeletonController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonStrayController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonStrayController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonStrayController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonStrayController.java index de3375b7b..090fe32c3 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonStrayController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonStrayController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftStray; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftStray; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SkeletonStrayController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonWitherController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonWitherController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonWitherController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonWitherController.java index 22f1b8267..cc65ca5fc 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonWitherController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonWitherController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWitherSkeleton; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWitherSkeleton; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SkeletonWitherController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SlimeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SlimeController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SlimeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SlimeController.java index 6d258bd5d..af268e7c5 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SlimeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SlimeController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSlime; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -160,8 +160,8 @@ public class SlimeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnifferController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnifferController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnifferController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnifferController.java index c0b7a4a51..b3a119779 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnifferController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnifferController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSniffer; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSniffer; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -164,8 +164,8 @@ public class SnifferController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnowmanController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnowmanController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnowmanController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnowmanController.java index a2413fa64..aadb720d4 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnowmanController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnowmanController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSnowman; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SnowmanController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SpiderController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SpiderController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SpiderController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SpiderController.java index 569e9d44c..5bd9c5ecf 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SpiderController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SpiderController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSpider; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SpiderController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SquidController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SquidController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SquidController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SquidController.java index cb3402104..06d886b52 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SquidController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SquidController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSquid; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class SquidController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/StriderController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/StriderController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/StriderController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/StriderController.java index 14e003013..40e09c055 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/StriderController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/StriderController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftStrider; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftStrider; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class StriderController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TadpoleController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TadpoleController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TadpoleController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TadpoleController.java index f3a706452..e9b35bbc1 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TadpoleController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TadpoleController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTadpole; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTadpole; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -192,8 +192,8 @@ public class TadpoleController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TraderLlamaController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TraderLlamaController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TraderLlamaController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TraderLlamaController.java index b17182688..a2e686408 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TraderLlamaController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TraderLlamaController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTraderLlama; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTraderLlama; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; @@ -177,8 +177,8 @@ public class TraderLlamaController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TropicalFishController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TropicalFishController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TropicalFishController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TropicalFishController.java index 43a7fe5b3..d64fe6f62 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TropicalFishController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TropicalFishController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTropicalFish; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTropicalFish; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -194,8 +194,8 @@ public class TropicalFishController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TurtleController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TurtleController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TurtleController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TurtleController.java index 7dfd2bbfd..27cd652d3 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TurtleController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TurtleController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTurtle; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTurtle; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -180,8 +180,8 @@ public class TurtleController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VexController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VexController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VexController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VexController.java index 75ddc6e83..e75b467a5 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VexController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VexController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVex; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVex; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -145,8 +145,8 @@ public class VexController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VillagerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VillagerController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VillagerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VillagerController.java index f2e34f832..d60b4a712 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VillagerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VillagerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVillager; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -181,8 +181,8 @@ public class VillagerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VindicatorController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VindicatorController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VindicatorController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VindicatorController.java index df66bb4c4..fef7f5388 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VindicatorController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VindicatorController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVindicator; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVindicator; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -159,8 +159,8 @@ public class VindicatorController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WanderingTraderController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WanderingTraderController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WanderingTraderController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WanderingTraderController.java index 6f31d8afd..545c2a5b7 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WanderingTraderController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WanderingTraderController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWanderingTrader; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWanderingTrader; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -182,8 +182,8 @@ public class WanderingTraderController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WardenController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WardenController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WardenController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WardenController.java index c1c521668..ce048e2c2 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WardenController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WardenController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWarden; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWarden; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -165,8 +165,8 @@ public class WardenController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitchController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitchController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitchController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitchController.java index 0a1c518cb..63e92ec4e 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitchController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitchController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWitch; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class WitchController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitherController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitherController.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitherController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitherController.java index 359aa68f5..9e0450f82 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitherController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitherController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWither; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWither; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -157,8 +157,8 @@ public class WitherController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WolfController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WolfController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WolfController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WolfController.java index d59c3abcc..464549086 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WolfController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WolfController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWolf; import org.bukkit.event.entity.EntityTargetEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -161,8 +161,8 @@ public class WolfController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZoglinController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZoglinController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZoglinController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZoglinController.java index d98d4fbf0..03d9f5640 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZoglinController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZoglinController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftZoglin; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftZoglin; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -160,8 +160,8 @@ public class ZoglinController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieController.java index 768781e65..d96c2230a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftZombie; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class ZombieController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieHuskController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieHuskController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieHuskController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieHuskController.java index 4feabd9f3..d2187af16 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieHuskController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieHuskController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftHusk; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHusk; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class ZombieHuskController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieVillagerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieVillagerController.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieVillagerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieVillagerController.java index 810e9b1ff..466feeb66 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZombieVillagerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZombieVillagerController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_21_R2.entity; +package net.citizensnpcs.nms.v1_21_R3.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVillagerZombie; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVillagerZombie; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -158,8 +158,8 @@ public class ZombieVillagerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/AreaEffectCloudController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/AreaEffectCloudController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/AreaEffectCloudController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/AreaEffectCloudController.java index 910042073..802cfd386 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/AreaEffectCloudController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftAreaEffectCloud; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftAreaEffectCloud; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -85,8 +85,8 @@ public class AreaEffectCloudController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BlockDisplayController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BlockDisplayController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BlockDisplayController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BlockDisplayController.java index 0a1ddd332..f0b4907db 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BlockDisplayController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BlockDisplayController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBlockDisplay; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBlockDisplay; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -98,8 +98,8 @@ public class BlockDisplayController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BoatController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BoatController.java similarity index 96% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BoatController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BoatController.java index 0916bbe89..a7585133d 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BoatController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BoatController.java @@ -1,20 +1,20 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBoat; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import org.bukkit.entity.Player; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.trait.MobType; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -258,8 +258,8 @@ public class BoatController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BreezeWindChargeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BreezeWindChargeController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BreezeWindChargeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BreezeWindChargeController.java index 49e626669..08c4fb474 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/BreezeWindChargeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/BreezeWindChargeController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBreezeWindCharge; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBreezeWindCharge; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -85,8 +85,8 @@ public class BreezeWindChargeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ChestBoatController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ChestBoatController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ChestBoatController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ChestBoatController.java index 2fe488956..870c98e9b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ChestBoatController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ChestBoatController.java @@ -1,19 +1,19 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftChestBoat; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftChestBoat; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.trait.MobType; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -160,8 +160,8 @@ public class ChestBoatController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ChestRaftController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ChestRaftController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ChestRaftController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ChestRaftController.java index 70d3713bd..394642c86 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ChestRaftController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ChestRaftController.java @@ -1,18 +1,18 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftChestBoat; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftChestBoat; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -123,8 +123,8 @@ public class ChestRaftController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/DragonFireballController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/DragonFireballController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/DragonFireballController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/DragonFireballController.java index e1e15684a..e03650f5c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/DragonFireballController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/DragonFireballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDragonFireball; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDragonFireball; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -85,8 +85,8 @@ public class DragonFireballController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EggController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EggController.java similarity index 90% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EggController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EggController.java index 539b5f21c..29a0adcc6 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EggController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EggController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEgg; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEgg; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -97,8 +97,8 @@ public class EggController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EnderCrystalController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EnderCrystalController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EnderCrystalController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EnderCrystalController.java index 947f8e873..bcce80967 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EnderCrystalController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderCrystal; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderCrystal; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -85,8 +85,8 @@ public class EnderCrystalController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EnderPearlController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EnderPearlController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EnderPearlController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EnderPearlController.java index 824d316a1..05c7908fb 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EnderPearlController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EnderPearlController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderPearl; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderPearl; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import org.bukkit.entity.EnderPearl; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -86,8 +86,8 @@ public class EnderPearlController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EvokerFangsController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EvokerFangsController.java similarity index 90% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EvokerFangsController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EvokerFangsController.java index 390399e68..39b429f4c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EvokerFangsController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EvokerFangsController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEvokerFangs; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEvokerFangs; import org.bukkit.event.player.PlayerInteractEntityEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -93,8 +93,8 @@ public class EvokerFangsController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ExperienceOrbController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ExperienceOrbController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ExperienceOrbController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ExperienceOrbController.java index 54508be2c..5217a4e3e 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ExperienceOrbController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftExperienceOrb; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftExperienceOrb; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class ExperienceOrbController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EyeOfEnderController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EyeOfEnderController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EyeOfEnderController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EyeOfEnderController.java index 19bce1e1e..52fb64854 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/EyeOfEnderController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/EyeOfEnderController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderSignal; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderSignal; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import org.bukkit.entity.EnderSignal; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -86,8 +86,8 @@ public class EyeOfEnderController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FallingBlockController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FallingBlockController.java similarity index 91% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FallingBlockController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FallingBlockController.java index 992f8ef24..f9a4b1ed8 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FallingBlockController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FallingBlockController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFallingBlock; -import org.bukkit.craftbukkit.v1_21_R2.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFallingBlock; +import org.bukkit.craftbukkit.v1_21_R3.util.CraftMagicNumbers; import org.bukkit.entity.FallingBlock; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -92,8 +92,8 @@ public class FallingBlockController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FireworkController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FireworkController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FireworkController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FireworkController.java index 8069439b7..fbb7bf531 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FireworkController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FireworkController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFirework; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFirework; import org.bukkit.entity.Firework; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class FireworkController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FishingHookController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FishingHookController.java similarity index 90% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FishingHookController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FishingHookController.java index 797f54ff1..41dffd5aa 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/FishingHookController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/FishingHookController.java @@ -1,22 +1,22 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFishHook; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFishHook; import org.bukkit.entity.FishHook; import com.mojang.authlib.GameProfile; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -109,8 +109,8 @@ public class FishingHookController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/GlowItemFrameController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/GlowItemFrameController.java similarity index 91% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/GlowItemFrameController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/GlowItemFrameController.java index 110a82469..d7519f47a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/GlowItemFrameController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/GlowItemFrameController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGlowItemFrame; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGlowItemFrame; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -89,8 +89,8 @@ public class GlowItemFrameController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/InteractionController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/InteractionController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/InteractionController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/InteractionController.java index 8f0bdca9e..f9701db2e 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/InteractionController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/InteractionController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftInteraction; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftInteraction; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class InteractionController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemController.java similarity index 90% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemController.java index c5de67c63..0fc39334b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftItem; -import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftItem; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; import org.bukkit.entity.Item; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -87,8 +87,8 @@ public class ItemController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemDisplayController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemDisplayController.java similarity index 87% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemDisplayController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemDisplayController.java index 1f3c29520..9f1788fc3 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemDisplayController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemDisplayController.java @@ -1,18 +1,18 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftItemDisplay; -import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftItemDisplay; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -92,8 +92,8 @@ public class ItemDisplayController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemFrameController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemFrameController.java similarity index 91% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemFrameController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemFrameController.java index 444c95b90..9a98a37ab 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ItemFrameController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ItemFrameController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftItemFrame; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftItemFrame; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -89,8 +89,8 @@ public class ItemFrameController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LargeFireballController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LargeFireballController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LargeFireballController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LargeFireballController.java index 907946fa1..bf5688a01 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LargeFireballController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LargeFireballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftLargeFireball; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftLargeFireball; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class LargeFireballController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LeashController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LeashController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LeashController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LeashController.java index 13f8e8926..e4f3e750a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LeashController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LeashController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftLeash; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftLeash; import org.bukkit.entity.LeashHitch; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class LeashController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LlamaSpitController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LlamaSpitController.java similarity index 90% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LlamaSpitController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LlamaSpitController.java index fe321a918..908e6ab84 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/LlamaSpitController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftLlamaSpit; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftLlamaSpit; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -92,8 +92,8 @@ public class LlamaSpitController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MarkerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MarkerController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MarkerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MarkerController.java index 09c0657df..5d0c61db4 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MarkerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MarkerController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMarker; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMarker; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class MarkerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartChestController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartChestController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartChestController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartChestController.java index 8ad9d45b0..5b530364e 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartChestController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartChestController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMinecartChest; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMinecartChest; import org.bukkit.entity.Minecart; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class MinecartChestController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartCommandController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartCommandController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartCommandController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartCommandController.java index 5f00eb355..503a18951 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartCommandController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMinecartCommand; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMinecartCommand; import org.bukkit.entity.Minecart; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class MinecartCommandController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartFurnaceController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartFurnaceController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartFurnaceController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartFurnaceController.java index 95d6db33c..db50bb8ba 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartFurnaceController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMinecartFurnace; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMinecartFurnace; import org.bukkit.entity.Minecart; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class MinecartFurnaceController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartHopperController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartHopperController.java similarity index 92% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartHopperController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartHopperController.java index 1c498858e..ad7f8f58b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartHopperController.java @@ -1,11 +1,11 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.entity.Minecart; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -67,8 +67,8 @@ public class MinecartHopperController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartRideableController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartRideableController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartRideableController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartRideableController.java index 900f11ddd..80eef8087 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartRideableController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMinecartRideable; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMinecartRideable; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class MinecartRideableController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartSpawnerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartSpawnerController.java similarity index 92% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartSpawnerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartSpawnerController.java index d8720ef20..406fd95ed 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartSpawnerController.java @@ -1,11 +1,11 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.entity.Minecart; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -67,8 +67,8 @@ public class MinecartSpawnerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartTNTController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartTNTController.java similarity index 92% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartTNTController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartTNTController.java index 582ba73b0..4481beb15 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/MinecartTNTController.java @@ -1,11 +1,11 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.entity.Minecart; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -67,8 +67,8 @@ public class MinecartTNTController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/OminousItemSpawnerController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/OminousItemSpawnerController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/OminousItemSpawnerController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/OminousItemSpawnerController.java index eaef9893a..5e3dc16cd 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/OminousItemSpawnerController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/OminousItemSpawnerController.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftOminousItemSpawner; -import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftOminousItemSpawner; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -91,8 +91,8 @@ public class OminousItemSpawnerController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/PaintingController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/PaintingController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/PaintingController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/PaintingController.java index bf7c3fbbf..d8c6d1d95 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/PaintingController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/PaintingController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPainting; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPainting; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class PaintingController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/RaftController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/RaftController.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/RaftController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/RaftController.java index 8a0eb0e32..80b7cf8af 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/RaftController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/RaftController.java @@ -1,19 +1,19 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import java.util.function.Supplier; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBoat; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import org.bukkit.entity.Player; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; @@ -209,8 +209,8 @@ public class RaftController extends AbstractEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ShulkerBulletController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ShulkerBulletController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ShulkerBulletController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ShulkerBulletController.java index 3b8057055..513b17cea 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ShulkerBulletController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftShulkerBullet; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftShulkerBullet; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class ShulkerBulletController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SmallFireballController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SmallFireballController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SmallFireballController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SmallFireballController.java index d24076361..e4254d5a7 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SmallFireballController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SmallFireballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSmallFireball; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSmallFireball; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class SmallFireballController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SnowballController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SnowballController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SnowballController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SnowballController.java index d9a9ce641..4342d3627 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SnowballController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SnowballController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSnowball; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSnowball; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class SnowballController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SpectralArrowController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SpectralArrowController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SpectralArrowController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SpectralArrowController.java index 82cdc6544..10ea5dee0 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/SpectralArrowController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSpectralArrow; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSpectralArrow; import org.bukkit.entity.Arrow; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class SpectralArrowController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TNTPrimedController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TNTPrimedController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TNTPrimedController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TNTPrimedController.java index 883ee7b30..a2b35446b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TNTPrimedController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTNTPrimed; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTNTPrimed; import org.bukkit.entity.TNTPrimed; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class TNTPrimedController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TextDisplayController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TextDisplayController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TextDisplayController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TextDisplayController.java index 8d16d0082..bc7850daf 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TextDisplayController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TextDisplayController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTextDisplay; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTextDisplay; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class TextDisplayController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownExpBottleController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownExpBottleController.java similarity index 89% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownExpBottleController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownExpBottleController.java index ff39221a9..3d750bda2 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownExpBottleController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftThrownExpBottle; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftThrownExpBottle; import org.bukkit.entity.ThrownExpBottle; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class ThrownExpBottleController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownPotionController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownPotionController.java similarity index 90% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownPotionController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownPotionController.java index 8c3ccd16b..89ec6597d 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownPotionController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftThrownPotion; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -84,8 +84,8 @@ public class ThrownPotionController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownTridentController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownTridentController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownTridentController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownTridentController.java index 87a340db9..210facf0c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/ThrownTridentController.java @@ -1,16 +1,16 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTrident; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTrident; import org.bukkit.entity.Trident; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -80,8 +80,8 @@ public class ThrownTridentController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TippedArrowController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TippedArrowController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TippedArrowController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TippedArrowController.java index 583379466..1a4812aca 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/TippedArrowController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/TippedArrowController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftArrow; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class TippedArrowController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/WindChargeController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/WindChargeController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/WindChargeController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/WindChargeController.java index d34cd8baa..7944dcff9 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/WindChargeController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/WindChargeController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWindCharge; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWindCharge; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class WindChargeController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/WitherSkullController.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/WitherSkullController.java similarity index 88% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/WitherSkullController.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/WitherSkullController.java index 2e4d1ff94..d8fee85ce 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/nonliving/WitherSkullController.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/nonliving/WitherSkullController.java @@ -1,15 +1,15 @@ -package net.citizensnpcs.nms.v1_21_R2.entity.nonliving; +package net.citizensnpcs.nms.v1_21_R3.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWitherSkull; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWitherSkull; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.MobEntityController; -import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder; -import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.entity.MobEntityController; +import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder; +import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; @@ -79,8 +79,8 @@ public class WitherSkullController extends MobEntityController { } @Override - protected AABB makeBoundingBox() { - return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); + protected AABB makeBoundingBox(Vec3 vec3) { + return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3)); } @Override diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/network/EmptyConnection.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/network/EmptyConnection.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/network/EmptyConnection.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/network/EmptyConnection.java index f5af70f8b..fe6a33575 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/network/EmptyConnection.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/network/EmptyConnection.java @@ -1,9 +1,9 @@ -package net.citizensnpcs.nms.v1_21_R2.network; +package net.citizensnpcs.nms.v1_21_R3.network; import java.io.IOException; import java.net.SocketAddress; -import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl; import net.citizensnpcs.util.EmptyChannel; import net.minecraft.network.Connection; import net.minecraft.network.PacketListener; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/network/EmptyPacketListener.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/network/EmptyPacketListener.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/network/EmptyPacketListener.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/network/EmptyPacketListener.java index 3b86d8c77..f5a9750ff 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/network/EmptyPacketListener.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/network/EmptyPacketListener.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.network; +package net.citizensnpcs.nms.v1_21_R3.network; import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CitizensBlockBreaker.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CitizensBlockBreaker.java similarity index 97% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CitizensBlockBreaker.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CitizensBlockBreaker.java index 157393434..46d6add1c 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CitizensBlockBreaker.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CitizensBlockBreaker.java @@ -1,6 +1,6 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; -import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack; import net.citizensnpcs.util.AbstractBlockBreaker; import net.minecraft.core.BlockPos; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CitizensEntityTracker.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CitizensEntityTracker.java similarity index 98% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CitizensEntityTracker.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CitizensEntityTracker.java index 5464333b4..3ac83f89a 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CitizensEntityTracker.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CitizensEntityTracker.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.lang.invoke.MethodHandle; import java.util.Collection; @@ -13,7 +13,7 @@ import net.citizensnpcs.api.event.NPCLinkToPlayerEvent; import net.citizensnpcs.api.event.NPCSeenByPlayerEvent; import net.citizensnpcs.api.event.NPCUnlinkFromPlayerEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R2.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_21_R3.entity.EntityHumanNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CustomEntityRegistry.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CustomEntityRegistry.java similarity index 99% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CustomEntityRegistry.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CustomEntityRegistry.java index 6e8382b53..e3508ce7f 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/CustomEntityRegistry.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/CustomEntityRegistry.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.lang.invoke.MethodHandle; import java.util.Iterator; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EmptyAdvancementDataPlayer.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EmptyAdvancementDataPlayer.java similarity index 98% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EmptyAdvancementDataPlayer.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EmptyAdvancementDataPlayer.java index 31f395d00..fe8f5dafe 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EmptyAdvancementDataPlayer.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EmptyAdvancementDataPlayer.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.lang.invoke.MethodHandle; import java.util.Collection; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EmptyServerStatsCounter.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EmptyServerStatsCounter.java similarity index 95% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EmptyServerStatsCounter.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EmptyServerStatsCounter.java index 1f2389135..d0d41f62b 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EmptyServerStatsCounter.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EmptyServerStatsCounter.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import com.mojang.datafixers.DataFixer; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityJumpControl.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityJumpControl.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityJumpControl.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityJumpControl.java index fe8f2c4d3..1d0d4359d 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityJumpControl.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityJumpControl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityMoveControl.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityMoveControl.java similarity index 98% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityMoveControl.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityMoveControl.java index 816829ef4..b64593d14 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityMoveControl.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityMoveControl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.Random; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNavigation.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNavigation.java similarity index 99% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNavigation.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNavigation.java index fcdbe59c4..235e7d622 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNavigation.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNavigation.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.Set; import java.util.stream.Collectors; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNodeEvaluator.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNodeEvaluator.java similarity index 99% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNodeEvaluator.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNodeEvaluator.java index 3343e7218..f0ec19a98 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNodeEvaluator.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNodeEvaluator.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.EnumSet; import java.util.Iterator; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNodeEvaluatorBase.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNodeEvaluatorBase.java similarity index 98% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNodeEvaluatorBase.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNodeEvaluatorBase.java index 4db2b9757..e3ce438e6 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityNodeEvaluatorBase.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityNodeEvaluatorBase.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityPathfinder.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityPathfinder.java similarity index 99% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityPathfinder.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityPathfinder.java index e2a150543..89e8f18d8 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityPathfinder.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityPathfinder.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.Comparator; import java.util.Iterator; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityPathfindingContext.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityPathfindingContext.java similarity index 97% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityPathfindingContext.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityPathfindingContext.java index a32ac082a..edbce7003 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/EntityPathfindingContext.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/EntityPathfindingContext.java @@ -1,6 +1,6 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; -import net.citizensnpcs.nms.v1_21_R2.entity.SlimeController.EntitySlimeNPC; +import net.citizensnpcs.nms.v1_21_R3.entity.SlimeController.EntitySlimeNPC; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BlockTags; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/ForwardingNPCHolder.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/ForwardingNPCHolder.java similarity index 93% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/ForwardingNPCHolder.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/ForwardingNPCHolder.java index 4e17d0b24..b6411b0f1 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/ForwardingNPCHolder.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/ForwardingNPCHolder.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import org.bukkit.entity.Entity; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/MobAI.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/MobAI.java similarity index 99% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/MobAI.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/MobAI.java index d3d8930e7..a46d56676 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/MobAI.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/MobAI.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.Map; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/NMSBoundingBox.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/NMSBoundingBox.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/NMSBoundingBox.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/NMSBoundingBox.java index 9b606dbb3..fea852a26 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/NMSBoundingBox.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/NMSBoundingBox.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.function.Supplier; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/NMSImpl.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/NMSImpl.java similarity index 92% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/NMSImpl.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/NMSImpl.java index 96ef1a612..75d1d4ae9 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/NMSImpl.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/NMSImpl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.lang.invoke.MethodHandle; import java.net.URL; @@ -27,17 +27,17 @@ import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; import org.bukkit.boss.BossBar; import org.bukkit.command.BlockCommandSender; -import org.bukkit.craftbukkit.v1_21_R2.CraftServer; -import org.bukkit.craftbukkit.v1_21_R2.CraftSound; -import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R2.block.CraftBlock; -import org.bukkit.craftbukkit.v1_21_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_21_R2.boss.CraftBossBar; -import org.bukkit.craftbukkit.v1_21_R2.command.CraftBlockCommandSender; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftInventoryAnvil; -import org.bukkit.craftbukkit.v1_21_R2.inventory.view.CraftAnvilView; +import org.bukkit.craftbukkit.v1_21_R3.CraftServer; +import org.bukkit.craftbukkit.v1_21_R3.CraftSound; +import org.bukkit.craftbukkit.v1_21_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_21_R3.block.CraftBlock; +import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_21_R3.boss.CraftBossBar; +import org.bukkit.craftbukkit.v1_21_R3.command.CraftBlockCommandSender; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftInventoryAnvil; +import org.bukkit.craftbukkit.v1_21_R3.inventory.view.CraftAnvilView; import org.bukkit.entity.EntityType; import org.bukkit.entity.FishHook; import org.bukkit.entity.Player; @@ -86,139 +86,138 @@ import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.EntityDim; import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.api.util.SpigotUtil.InventoryViewAPI; -import net.citizensnpcs.nms.v1_21_R2.entity.AllayController; -import net.citizensnpcs.nms.v1_21_R2.entity.ArmadilloController; -import net.citizensnpcs.nms.v1_21_R2.entity.ArmorStandController; -import net.citizensnpcs.nms.v1_21_R2.entity.AxolotlController; -import net.citizensnpcs.nms.v1_21_R2.entity.BatController; -import net.citizensnpcs.nms.v1_21_R2.entity.BeeController; -import net.citizensnpcs.nms.v1_21_R2.entity.BlazeController; -import net.citizensnpcs.nms.v1_21_R2.entity.BoggedController; -import net.citizensnpcs.nms.v1_21_R2.entity.BreezeController; -import net.citizensnpcs.nms.v1_21_R2.entity.CamelController; -import net.citizensnpcs.nms.v1_21_R2.entity.CatController; -import net.citizensnpcs.nms.v1_21_R2.entity.CaveSpiderController; -import net.citizensnpcs.nms.v1_21_R2.entity.ChickenController; -import net.citizensnpcs.nms.v1_21_R2.entity.CodController; -import net.citizensnpcs.nms.v1_21_R2.entity.CowController; -import net.citizensnpcs.nms.v1_21_R2.entity.CreakingController; -import net.citizensnpcs.nms.v1_21_R2.entity.CreakingTransientController; -import net.citizensnpcs.nms.v1_21_R2.entity.CreeperController; -import net.citizensnpcs.nms.v1_21_R2.entity.DolphinController; -import net.citizensnpcs.nms.v1_21_R2.entity.DrownedController; -import net.citizensnpcs.nms.v1_21_R2.entity.EnderDragonController; -import net.citizensnpcs.nms.v1_21_R2.entity.EndermanController; -import net.citizensnpcs.nms.v1_21_R2.entity.EndermiteController; -import net.citizensnpcs.nms.v1_21_R2.entity.EvokerController; -import net.citizensnpcs.nms.v1_21_R2.entity.FoxController; -import net.citizensnpcs.nms.v1_21_R2.entity.FrogController; -import net.citizensnpcs.nms.v1_21_R2.entity.GhastController; -import net.citizensnpcs.nms.v1_21_R2.entity.GiantController; -import net.citizensnpcs.nms.v1_21_R2.entity.GlowSquidController; -import net.citizensnpcs.nms.v1_21_R2.entity.GoatController; -import net.citizensnpcs.nms.v1_21_R2.entity.GuardianController; -import net.citizensnpcs.nms.v1_21_R2.entity.GuardianElderController; -import net.citizensnpcs.nms.v1_21_R2.entity.HoglinController; -import net.citizensnpcs.nms.v1_21_R2.entity.HorseController; -import net.citizensnpcs.nms.v1_21_R2.entity.HorseDonkeyController; -import net.citizensnpcs.nms.v1_21_R2.entity.HorseMuleController; -import net.citizensnpcs.nms.v1_21_R2.entity.HorseSkeletonController; -import net.citizensnpcs.nms.v1_21_R2.entity.HorseZombieController; -import net.citizensnpcs.nms.v1_21_R2.entity.HumanController; -import net.citizensnpcs.nms.v1_21_R2.entity.IllusionerController; -import net.citizensnpcs.nms.v1_21_R2.entity.IronGolemController; -import net.citizensnpcs.nms.v1_21_R2.entity.LlamaController; -import net.citizensnpcs.nms.v1_21_R2.entity.MagmaCubeController; -import net.citizensnpcs.nms.v1_21_R2.entity.MushroomCowController; -import net.citizensnpcs.nms.v1_21_R2.entity.OcelotController; -import net.citizensnpcs.nms.v1_21_R2.entity.PandaController; -import net.citizensnpcs.nms.v1_21_R2.entity.ParrotController; -import net.citizensnpcs.nms.v1_21_R2.entity.PhantomController; -import net.citizensnpcs.nms.v1_21_R2.entity.PigController; -import net.citizensnpcs.nms.v1_21_R2.entity.PigZombieController; -import net.citizensnpcs.nms.v1_21_R2.entity.PiglinBruteController; -import net.citizensnpcs.nms.v1_21_R2.entity.PiglinController; -import net.citizensnpcs.nms.v1_21_R2.entity.PillagerController; -import net.citizensnpcs.nms.v1_21_R2.entity.PolarBearController; -import net.citizensnpcs.nms.v1_21_R2.entity.PufferFishController; -import net.citizensnpcs.nms.v1_21_R2.entity.RabbitController; -import net.citizensnpcs.nms.v1_21_R2.entity.RavagerController; -import net.citizensnpcs.nms.v1_21_R2.entity.SalmonController; -import net.citizensnpcs.nms.v1_21_R2.entity.SheepController; -import net.citizensnpcs.nms.v1_21_R2.entity.ShulkerController; -import net.citizensnpcs.nms.v1_21_R2.entity.SilverfishController; -import net.citizensnpcs.nms.v1_21_R2.entity.SkeletonController; -import net.citizensnpcs.nms.v1_21_R2.entity.SkeletonStrayController; -import net.citizensnpcs.nms.v1_21_R2.entity.SkeletonWitherController; -import net.citizensnpcs.nms.v1_21_R2.entity.SlimeController; -import net.citizensnpcs.nms.v1_21_R2.entity.SnifferController; -import net.citizensnpcs.nms.v1_21_R2.entity.SnowmanController; -import net.citizensnpcs.nms.v1_21_R2.entity.SpiderController; -import net.citizensnpcs.nms.v1_21_R2.entity.SquidController; -import net.citizensnpcs.nms.v1_21_R2.entity.StriderController; -import net.citizensnpcs.nms.v1_21_R2.entity.TadpoleController; -import net.citizensnpcs.nms.v1_21_R2.entity.TraderLlamaController; -import net.citizensnpcs.nms.v1_21_R2.entity.TropicalFishController; -import net.citizensnpcs.nms.v1_21_R2.entity.TurtleController; -import net.citizensnpcs.nms.v1_21_R2.entity.VexController; -import net.citizensnpcs.nms.v1_21_R2.entity.VillagerController; -import net.citizensnpcs.nms.v1_21_R2.entity.VindicatorController; -import net.citizensnpcs.nms.v1_21_R2.entity.WanderingTraderController; -import net.citizensnpcs.nms.v1_21_R2.entity.WardenController; -import net.citizensnpcs.nms.v1_21_R2.entity.WitchController; -import net.citizensnpcs.nms.v1_21_R2.entity.WitherController; -import net.citizensnpcs.nms.v1_21_R2.entity.WolfController; -import net.citizensnpcs.nms.v1_21_R2.entity.ZoglinController; -import net.citizensnpcs.nms.v1_21_R2.entity.ZombieController; -import net.citizensnpcs.nms.v1_21_R2.entity.ZombieHuskController; -import net.citizensnpcs.nms.v1_21_R2.entity.ZombieVillagerController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.BlockDisplayController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.BoatController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.BreezeWindChargeController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ChestBoatController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ChestRaftController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.DragonFireballController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.EggController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.EnderCrystalController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.EnderPearlController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.EvokerFangsController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ExperienceOrbController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.EyeOfEnderController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.FallingBlockController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.FireworkController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.FishingHookController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.GlowItemFrameController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.InteractionController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ItemController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ItemDisplayController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ItemFrameController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.LargeFireballController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.LeashController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.LlamaSpitController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MarkerController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartChestController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartCommandController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartFurnaceController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartHopperController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartRideableController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartSpawnerController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.MinecartTNTController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.OminousItemSpawnerController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.PaintingController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.RaftController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ShulkerBulletController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.SmallFireballController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.SnowballController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.SpectralArrowController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.TNTPrimedController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.TextDisplayController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ThrownExpBottleController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ThrownPotionController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.ThrownTridentController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.TippedArrowController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.WindChargeController; -import net.citizensnpcs.nms.v1_21_R2.entity.nonliving.WitherSkullController; +import net.citizensnpcs.nms.v1_21_R3.entity.AllayController; +import net.citizensnpcs.nms.v1_21_R3.entity.ArmadilloController; +import net.citizensnpcs.nms.v1_21_R3.entity.ArmorStandController; +import net.citizensnpcs.nms.v1_21_R3.entity.AxolotlController; +import net.citizensnpcs.nms.v1_21_R3.entity.BatController; +import net.citizensnpcs.nms.v1_21_R3.entity.BeeController; +import net.citizensnpcs.nms.v1_21_R3.entity.BlazeController; +import net.citizensnpcs.nms.v1_21_R3.entity.BoggedController; +import net.citizensnpcs.nms.v1_21_R3.entity.BreezeController; +import net.citizensnpcs.nms.v1_21_R3.entity.CamelController; +import net.citizensnpcs.nms.v1_21_R3.entity.CatController; +import net.citizensnpcs.nms.v1_21_R3.entity.CaveSpiderController; +import net.citizensnpcs.nms.v1_21_R3.entity.ChickenController; +import net.citizensnpcs.nms.v1_21_R3.entity.CodController; +import net.citizensnpcs.nms.v1_21_R3.entity.CowController; +import net.citizensnpcs.nms.v1_21_R3.entity.CreakingController; +import net.citizensnpcs.nms.v1_21_R3.entity.CreeperController; +import net.citizensnpcs.nms.v1_21_R3.entity.DolphinController; +import net.citizensnpcs.nms.v1_21_R3.entity.DrownedController; +import net.citizensnpcs.nms.v1_21_R3.entity.EnderDragonController; +import net.citizensnpcs.nms.v1_21_R3.entity.EndermanController; +import net.citizensnpcs.nms.v1_21_R3.entity.EndermiteController; +import net.citizensnpcs.nms.v1_21_R3.entity.EvokerController; +import net.citizensnpcs.nms.v1_21_R3.entity.FoxController; +import net.citizensnpcs.nms.v1_21_R3.entity.FrogController; +import net.citizensnpcs.nms.v1_21_R3.entity.GhastController; +import net.citizensnpcs.nms.v1_21_R3.entity.GiantController; +import net.citizensnpcs.nms.v1_21_R3.entity.GlowSquidController; +import net.citizensnpcs.nms.v1_21_R3.entity.GoatController; +import net.citizensnpcs.nms.v1_21_R3.entity.GuardianController; +import net.citizensnpcs.nms.v1_21_R3.entity.GuardianElderController; +import net.citizensnpcs.nms.v1_21_R3.entity.HoglinController; +import net.citizensnpcs.nms.v1_21_R3.entity.HorseController; +import net.citizensnpcs.nms.v1_21_R3.entity.HorseDonkeyController; +import net.citizensnpcs.nms.v1_21_R3.entity.HorseMuleController; +import net.citizensnpcs.nms.v1_21_R3.entity.HorseSkeletonController; +import net.citizensnpcs.nms.v1_21_R3.entity.HorseZombieController; +import net.citizensnpcs.nms.v1_21_R3.entity.HumanController; +import net.citizensnpcs.nms.v1_21_R3.entity.IllusionerController; +import net.citizensnpcs.nms.v1_21_R3.entity.IronGolemController; +import net.citizensnpcs.nms.v1_21_R3.entity.LlamaController; +import net.citizensnpcs.nms.v1_21_R3.entity.MagmaCubeController; +import net.citizensnpcs.nms.v1_21_R3.entity.MushroomCowController; +import net.citizensnpcs.nms.v1_21_R3.entity.OcelotController; +import net.citizensnpcs.nms.v1_21_R3.entity.PandaController; +import net.citizensnpcs.nms.v1_21_R3.entity.ParrotController; +import net.citizensnpcs.nms.v1_21_R3.entity.PhantomController; +import net.citizensnpcs.nms.v1_21_R3.entity.PigController; +import net.citizensnpcs.nms.v1_21_R3.entity.PigZombieController; +import net.citizensnpcs.nms.v1_21_R3.entity.PiglinBruteController; +import net.citizensnpcs.nms.v1_21_R3.entity.PiglinController; +import net.citizensnpcs.nms.v1_21_R3.entity.PillagerController; +import net.citizensnpcs.nms.v1_21_R3.entity.PolarBearController; +import net.citizensnpcs.nms.v1_21_R3.entity.PufferFishController; +import net.citizensnpcs.nms.v1_21_R3.entity.RabbitController; +import net.citizensnpcs.nms.v1_21_R3.entity.RavagerController; +import net.citizensnpcs.nms.v1_21_R3.entity.SalmonController; +import net.citizensnpcs.nms.v1_21_R3.entity.SheepController; +import net.citizensnpcs.nms.v1_21_R3.entity.ShulkerController; +import net.citizensnpcs.nms.v1_21_R3.entity.SilverfishController; +import net.citizensnpcs.nms.v1_21_R3.entity.SkeletonController; +import net.citizensnpcs.nms.v1_21_R3.entity.SkeletonStrayController; +import net.citizensnpcs.nms.v1_21_R3.entity.SkeletonWitherController; +import net.citizensnpcs.nms.v1_21_R3.entity.SlimeController; +import net.citizensnpcs.nms.v1_21_R3.entity.SnifferController; +import net.citizensnpcs.nms.v1_21_R3.entity.SnowmanController; +import net.citizensnpcs.nms.v1_21_R3.entity.SpiderController; +import net.citizensnpcs.nms.v1_21_R3.entity.SquidController; +import net.citizensnpcs.nms.v1_21_R3.entity.StriderController; +import net.citizensnpcs.nms.v1_21_R3.entity.TadpoleController; +import net.citizensnpcs.nms.v1_21_R3.entity.TraderLlamaController; +import net.citizensnpcs.nms.v1_21_R3.entity.TropicalFishController; +import net.citizensnpcs.nms.v1_21_R3.entity.TurtleController; +import net.citizensnpcs.nms.v1_21_R3.entity.VexController; +import net.citizensnpcs.nms.v1_21_R3.entity.VillagerController; +import net.citizensnpcs.nms.v1_21_R3.entity.VindicatorController; +import net.citizensnpcs.nms.v1_21_R3.entity.WanderingTraderController; +import net.citizensnpcs.nms.v1_21_R3.entity.WardenController; +import net.citizensnpcs.nms.v1_21_R3.entity.WitchController; +import net.citizensnpcs.nms.v1_21_R3.entity.WitherController; +import net.citizensnpcs.nms.v1_21_R3.entity.WolfController; +import net.citizensnpcs.nms.v1_21_R3.entity.ZoglinController; +import net.citizensnpcs.nms.v1_21_R3.entity.ZombieController; +import net.citizensnpcs.nms.v1_21_R3.entity.ZombieHuskController; +import net.citizensnpcs.nms.v1_21_R3.entity.ZombieVillagerController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.AreaEffectCloudController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.BlockDisplayController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.BoatController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.BreezeWindChargeController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ChestBoatController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ChestRaftController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.DragonFireballController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.EggController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.EnderCrystalController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.EnderPearlController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.EvokerFangsController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ExperienceOrbController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.EyeOfEnderController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.FallingBlockController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.FireworkController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.FishingHookController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.GlowItemFrameController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.InteractionController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ItemController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ItemDisplayController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ItemFrameController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.LargeFireballController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.LeashController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.LlamaSpitController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MarkerController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartChestController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartCommandController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartFurnaceController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartHopperController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartRideableController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartSpawnerController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.MinecartTNTController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.OminousItemSpawnerController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.PaintingController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.RaftController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ShulkerBulletController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.SmallFireballController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.SnowballController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.SpectralArrowController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.TNTPrimedController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.TextDisplayController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ThrownExpBottleController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ThrownPotionController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.ThrownTridentController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.TippedArrowController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.WindChargeController; +import net.citizensnpcs.nms.v1_21_R3.entity.nonliving.WitherSkullController; import net.citizensnpcs.npc.EntityControllers; import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator; @@ -1031,7 +1030,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.COW, CowController.class); EntityControllers.setEntityControllerForType(EntityType.CREEPER, CreeperController.class); EntityControllers.setEntityControllerForType(EntityType.CREAKING, CreakingController.class); - EntityControllers.setEntityControllerForType(EntityType.CREAKING_TRANSIENT, CreakingTransientController.class); EntityControllers.setEntityControllerForType(EntityType.DOLPHIN, DolphinController.class); EntityControllers.setEntityControllerForType(EntityType.DONKEY, HorseDonkeyController.class); EntityControllers.setEntityControllerForType(EntityType.DRAGON_FIREBALL, DragonFireballController.class); @@ -1253,19 +1251,19 @@ public class NMSImpl implements NMSBridge { list.set(i, new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), npcInfo.profile(), !disableTablist, npcInfo.latency(), npcInfo.gameMode(), - !disableTablist ? npcInfo.displayName() : Component.empty(), npcInfo.listOrder(), - npcInfo.chatSession())); + !disableTablist ? npcInfo.displayName() : Component.empty(), npcInfo.showHat(), + npcInfo.listOrder(), npcInfo.chatSession())); changed = true; } if (playerProfile == null) { playerProfile = NMS.getProfile(player); } if (trait.mirrorName()) { - list.set(i, - new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), playerProfile, !disableTablist, - npcInfo.latency(), npcInfo.gameMode(), Component.literal(Util - .possiblyStripBedrockPrefix(playerProfile.getName(), playerProfile.getId())), - npcInfo.listOrder(), npcInfo.chatSession())); + list.set(i, new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), playerProfile, + !disableTablist, npcInfo.latency(), npcInfo.gameMode(), + Component.literal( + Util.possiblyStripBedrockPrefix(playerProfile.getName(), playerProfile.getId())), + npcInfo.showHat(), npcInfo.listOrder(), npcInfo.chatSession())); changed = true; continue; } @@ -1437,9 +1435,10 @@ public class NMSImpl implements NMSBridge { ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket .createPlayerInitializing(Arrays.asList(from)); boolean list = from instanceof NPCHolder ? !((NPCHolder) from).getNPC().shouldRemoveFromTabList() : true; + ClientboundPlayerInfoUpdatePacket.Entry entry = new ClientboundPlayerInfoUpdatePacket.Entry(from.getUUID(), from.getGameProfile(), list, from.connection.latency(), from.gameMode.getGameModeForPlayer(), - list ? from.getTabListDisplayName() : Component.empty(), from.listOrder, + list ? from.getTabListDisplayName() : Component.empty(), false, from.listOrder, from.getChatSession() == null ? null : from.getChatSession().asData()); try { PLAYERINFO_ENTRIES.invoke(packet, Lists.newArrayList(entry)); @@ -2332,7 +2331,7 @@ public class NMSImpl implements NMSBridge { } public static boolean isLeashed(NPC npc, Supplier isLeashed, Mob entity) { - return NMS.isLeashed(npc, isLeashed, () -> entity.dropLeash(true, false)); + return NMS.isLeashed(npc, isLeashed, () -> entity.dropLeash()); } @SuppressWarnings("deprecation") @@ -2701,7 +2700,7 @@ public class NMSImpl implements NMSBridge { } } - private static final MethodHandle ARMADILLO_SCUTE_TIME = NMS.getSetter(Armadillo.class, "ck"); + private static final MethodHandle ARMADILLO_SCUTE_TIME = NMS.getSetter(Armadillo.class, "cj"); private static final MethodHandle ATTRIBUTE_PROVIDER_MAP = NMS.getFirstGetter(AttributeSupplier.class, Map.class); private static final MethodHandle ATTRIBUTE_PROVIDER_MAP_SETTER = NMS.getFirstFinalSetter(AttributeSupplier.class, Map.class); @@ -2719,7 +2718,7 @@ public class NMSImpl implements NMSBridge { public static final MethodHandle CONNECTION_PACKET_LISTENER = NMS.getSetter(Connection.class, "q"); private static final MethodHandle CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getFirstSetter(CraftBossBar.class, ServerBossEvent.class); - private static final EntityDataAccessor DATA_NAME_VISIBLE = NMS.getStaticObject(Entity.class, "aR"); + private static final EntityDataAccessor DATA_NAME_VISIBLE = NMS.getStaticObject(Entity.class, "aP"); private static final EntityDataAccessor DATA_POSE = NMS.getStaticObject(Entity.class, "aq"); private static final float DEFAULT_SPEED = 1F; public static final MethodHandle ENDERDRAGON_CHECK_WALLS = NMS.getFirstMethodHandleWithReturnType(EnderDragon.class, @@ -2728,7 +2727,7 @@ public class NMSImpl implements NMSBridge { ServerLevel.class, List.class); public static final MethodHandle ENDERDRAGON_KNOCKBACK = NMS.getMethodHandle(EnderDragon.class, "a", true, ServerLevel.class, List.class); - private static final EntityDataAccessor ENDERMAN_DATA_CREEPY = NMS.getStaticObject(EnderMan.class, "cc"); + private static final EntityDataAccessor ENDERMAN_DATA_CREEPY = NMS.getStaticObject(EnderMan.class, "cb"); private static final MethodHandle ENTITY_EYE_HEIGHT = NMS.getSetter(Entity.class, "bc"); private static final MethodHandle ENTITY_FISH_NUM_IN_SCHOOL = NMS.getFirstSetter(AbstractSchoolingFish.class, int.class); @@ -2747,7 +2746,7 @@ public class NMSImpl implements NMSBridge { private static final Location FROM_LOCATION = new Location(null, 0, 0, 0); private static final EntityDataAccessor INTERACTION_HEIGHT = NMS.getStaticObject(Interaction.class, "c"); private static final EntityDataAccessor INTERACTION_WIDTH = NMS.getStaticObject(Interaction.class, "b"); - private static final MethodHandle JUMP_FIELD = NMS.getGetter(LivingEntity.class, "bn"); + private static final MethodHandle JUMP_FIELD = NMS.getGetter(LivingEntity.class, "bm"); private static final MethodHandle LOOK_CONTROL_SETTER = NMS.getFirstSetter(Mob.class, LookControl.class); private static MethodHandle META_COMPOUND_TAG; private static final MethodHandle MINECRAFT_CLIENT = NMS.getFirstGetter(YggdrasilMinecraftSessionService.class, @@ -2767,8 +2766,8 @@ public class NMSImpl implements NMSBridge { private static final MethodHandle PLAYERINFO_ENTRIES = PLAYER_INFO_ENTRIES_LIST; private static final MethodHandle POSITION_CODEC_GETTER = NMS.getFirstGetter(ServerEntity.class, VecDeltaCodec.class); - private static final MethodHandle PUFFERFISH_DEFLATE = NMS.getSetter(Pufferfish.class, "cb"); - private static final MethodHandle PUFFERFISH_INFLATE = NMS.getSetter(Pufferfish.class, "ca"); + private static final MethodHandle PUFFERFISH_DEFLATE = NMS.getSetter(Pufferfish.class, "ca"); + private static final MethodHandle PUFFERFISH_INFLATE = NMS.getSetter(Pufferfish.class, "bZ"); public static EntityDataAccessor RABBIT_TYPE_DATAWATCHER = NMS.getFirstStaticObject(Rabbit.class, EntityDataAccessor.class); private static final Random RANDOM = Util.getFastRandom(); diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/PitchableLookControl.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/PitchableLookControl.java similarity index 94% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/PitchableLookControl.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/PitchableLookControl.java index 75c1a61eb..8de668951 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/PitchableLookControl.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/PitchableLookControl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.function.Supplier; diff --git a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/PlayerAnimationImpl.java b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/PlayerAnimationImpl.java similarity index 98% rename from v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/PlayerAnimationImpl.java rename to v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/PlayerAnimationImpl.java index 4e277d759..d25229cb9 100644 --- a/v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/util/PlayerAnimationImpl.java +++ b/v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/util/PlayerAnimationImpl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_21_R2.util; +package net.citizensnpcs.nms.v1_21_R3.util; import java.util.Map; diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index f2d8c2a97..93e9360cb 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -6,7 +6,7 @@ net.citizensnpcs citizens-parent - 2.0.36-SNAPSHOT + 2.0.37-SNAPSHOT citizens-v1_8_R3