From 4542d70a10fd44b68cff48874125e05d652b2bed Mon Sep 17 00:00:00 2001 From: fullwall Date: Tue, 3 Nov 2020 16:15:37 +0800 Subject: [PATCH] Rename to 1_16_R2 --- dist/pom.xml | 2 +- pom.xml | 2 +- {v1_16_R3 => v1_16_R2}/pom.xml | 2 +- .../nms/v1_16_R3/entity/BatController.java | 30 +- .../nms/v1_16_R3/entity/BeeController.java | 30 +- .../nms/v1_16_R3/entity/BlazeController.java | 30 +- .../nms/v1_16_R3/entity/CatController.java | 38 +- .../v1_16_R3/entity/CaveSpiderController.java | 36 +- .../v1_16_R3/entity/ChickenController.java | 38 +- .../nms/v1_16_R3/entity/CodController.java | 50 +-- .../nms/v1_16_R3/entity/CowController.java | 48 +-- .../v1_16_R3/entity/CreeperController.java | 40 +- .../v1_16_R3/entity/DolphinController.java | 44 +-- .../v1_16_R3/entity/DrownedController.java | 36 +- .../entity/EnderDragonController.java | 32 +- .../v1_16_R3/entity/EndermanController.java | 36 +- .../v1_16_R3/entity/EndermiteController.java | 36 +- .../nms/v1_16_R3/entity/EntityHumanNPC.java | 80 ++-- .../nms/v1_16_R3/entity/EvokerController.java | 36 +- .../nms/v1_16_R3/entity/FoxController.java | 38 +- .../nms/v1_16_R3/entity/GhastController.java | 30 +- .../nms/v1_16_R3/entity/GiantController.java | 36 +- .../v1_16_R3/entity/GuardianController.java | 36 +- .../entity/GuardianElderController.java | 36 +- .../nms/v1_16_R3/entity/HoglinController.java | 38 +- .../nms/v1_16_R3/entity/HorseController.java | 40 +- .../entity/HorseDonkeyController.java | 40 +- .../v1_16_R3/entity/HorseMuleController.java | 40 +- .../entity/HorseSkeletonController.java | 40 +- .../entity/HorseZombieController.java | 40 +- .../nms/v1_16_R3/entity/HumanController.java | 8 +- .../v1_16_R3/entity/IllusionerController.java | 36 +- .../v1_16_R3/entity/IronGolemController.java | 36 +- .../nms/v1_16_R3/entity/LlamaController.java | 38 +- .../v1_16_R3/entity/MagmaCubeController.java | 42 +- .../v1_16_R3/entity/MobEntityController.java | 18 +- .../entity/MushroomCowController.java | 44 +-- .../nms/v1_16_R3/entity/OcelotController.java | 40 +- .../nms/v1_16_R3/entity/PandaController.java | 38 +- .../nms/v1_16_R3/entity/ParrotController.java | 36 +- .../v1_16_R3/entity/PhantomController.java | 46 +-- .../nms/v1_16_R3/entity/PigController.java | 42 +- .../v1_16_R3/entity/PigZombieController.java | 36 +- .../entity/PiglinBruteController.java | 38 +- .../nms/v1_16_R3/entity/PiglinController.java | 38 +- .../v1_16_R3/entity/PillagerController.java | 38 +- .../v1_16_R3/entity/PolarBearController.java | 32 +- .../v1_16_R3/entity/PufferFishController.java | 54 +-- .../nms/v1_16_R3/entity/RabbitController.java | 40 +- .../v1_16_R3/entity/RavagerController.java | 38 +- .../nms/v1_16_R3/entity/SalmonController.java | 50 +-- .../nms/v1_16_R3/entity/SheepController.java | 38 +- .../v1_16_R3/entity/ShulkerController.java | 38 +- .../v1_16_R3/entity/SilverfishController.java | 36 +- .../v1_16_R3/entity/SkeletonController.java | 36 +- .../entity/SkeletonStrayController.java | 36 +- .../entity/SkeletonWitherController.java | 36 +- .../nms/v1_16_R3/entity/SlimeController.java | 42 +- .../v1_16_R3/entity/SnowmanController.java | 38 +- .../nms/v1_16_R3/entity/SpiderController.java | 36 +- .../nms/v1_16_R3/entity/SquidController.java | 36 +- .../v1_16_R3/entity/StriderController.java | 36 +- .../entity/TraderLlamaController.java | 38 +- .../entity/TropicalFishController.java | 50 +-- .../nms/v1_16_R3/entity/TurtleController.java | 48 +-- .../nms/v1_16_R3/entity/VexController.java | 30 +- .../v1_16_R3/entity/VillagerController.java | 54 +-- .../v1_16_R3/entity/VindicatorController.java | 38 +- .../entity/WanderingTraderController.java | 50 +-- .../nms/v1_16_R3/entity/WitchController.java | 36 +- .../nms/v1_16_R3/entity/WitherController.java | 30 +- .../nms/v1_16_R3/entity/WolfController.java | 40 +- .../nms/v1_16_R3/entity/ZoglinController.java | 38 +- .../nms/v1_16_R3/entity/ZombieController.java | 36 +- .../v1_16_R3/entity/ZombieHuskController.java | 36 +- .../entity/ZombieVillagerController.java | 36 +- .../nonliving/AreaEffectCloudController.java | 22 +- .../nonliving/ArmorStandController.java | 30 +- .../entity/nonliving/BoatController.java | 38 +- .../nonliving/DragonFireballController.java | 22 +- .../entity/nonliving/EggController.java | 24 +- .../nonliving/EnderCrystalController.java | 22 +- .../nonliving/EnderPearlController.java | 22 +- .../nonliving/EnderSignalController.java | 22 +- .../nonliving/EvokerFangsController.java | 30 +- .../nonliving/ExperienceOrbController.java | 22 +- .../nonliving/FallingBlockController.java | 36 +- .../entity/nonliving/FireworkController.java | 22 +- .../nonliving/FishingHookController.java | 36 +- .../entity/nonliving/ItemController.java | 30 +- .../entity/nonliving/ItemFrameController.java | 26 +- .../nonliving/LargeFireballController.java | 22 +- .../entity/nonliving/LeashController.java | 22 +- .../entity/nonliving/LlamaSpitController.java | 26 +- .../nonliving/MinecartChestController.java | 22 +- .../nonliving/MinecartCommandController.java | 22 +- .../nonliving/MinecartFurnaceController.java | 22 +- .../nonliving/MinecartHopperController.java | 16 +- .../nonliving/MinecartRideableController.java | 22 +- .../nonliving/MinecartSpawnerController.java | 16 +- .../nonliving/MinecartTNTController.java | 16 +- .../entity/nonliving/PaintingController.java | 22 +- .../nonliving/ShulkerBulletController.java | 22 +- .../nonliving/SmallFireballController.java | 22 +- .../entity/nonliving/SnowballController.java | 22 +- .../nonliving/SpectralArrowController.java | 22 +- .../entity/nonliving/TNTPrimedController.java | 22 +- .../nonliving/ThrownExpBottleController.java | 22 +- .../nonliving/ThrownPotionController.java | 24 +- .../nonliving/ThrownTridentController.java | 22 +- .../nonliving/TippedArrowController.java | 22 +- .../nonliving/WitherSkullController.java | 22 +- .../nms/v1_16_R3/network/EmptyChannel.java | 2 +- .../nms/v1_16_R3/network/EmptyNetHandler.java | 12 +- .../v1_16_R3/network/EmptyNetworkManager.java | 10 +- .../nms/v1_16_R3/network/EmptySocket.java | 2 +- .../nms/v1_16_R3/trait/Commands.java | 2 +- .../v1_16_R3/util/CitizensBlockBreaker.java | 32 +- .../v1_16_R3/util/CustomEntityRegistry.java | 4 +- .../util/EmptyAdvancementDataPlayer.java | 14 +- .../nms/v1_16_R3/util/NMSBoundingBox.java | 4 +- .../nms/v1_16_R3/util/NMSImpl.java | 374 +++++++++--------- .../v1_16_R3/util/PlayerAnimationImpl.java | 16 +- .../v1_16_R3/util/PlayerControllerJump.java | 4 +- .../v1_16_R3/util/PlayerControllerLook.java | 12 +- .../v1_16_R3/util/PlayerControllerMove.java | 20 +- .../nms/v1_16_R3/util/PlayerNavigation.java | 50 +-- .../nms/v1_16_R3/util/PlayerPathfinder.java | 20 +- .../util/PlayerPathfinderAbstract.java | 14 +- .../v1_16_R3/util/PlayerPathfinderNormal.java | 56 +-- .../nms/v1_16_R3/util/PlayerlistTracker.java | 14 +- 131 files changed, 2166 insertions(+), 2166 deletions(-) rename {v1_16_R3 => v1_16_R2}/pom.xml (98%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java (89%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java (89%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java (89%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java (89%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java (89%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java (89%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java (94%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java (90%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java (85%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java (84%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java (97%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java (50%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java (65%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java (90%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java (99%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java (88%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java (99%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java (87%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java (94%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java (77%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java (91%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java (86%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java (92%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java (91%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java (82%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java (93%) rename {v1_16_R3 => v1_16_R2}/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java (89%) diff --git a/dist/pom.xml b/dist/pom.xml index d9973220e..97064f158 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -82,7 +82,7 @@ ${project.groupId} - citizens-v1_16_R3 + citizens-v1_16_R2 ${project.version} jar compile diff --git a/pom.xml b/pom.xml index bf9f9f096..3afb54346 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ v1_13_R2 v1_14_R1 v1_15_R1 - v1_16_R3 + v1_16_R2 dist \ No newline at end of file diff --git a/v1_16_R3/pom.xml b/v1_16_R2/pom.xml similarity index 98% rename from v1_16_R3/pom.xml rename to v1_16_R2/pom.xml index ea30fa5ba..394a205dd 100644 --- a/v1_16_R3/pom.xml +++ b/v1_16_R2/pom.xml @@ -8,7 +8,7 @@ citizens-parent 2.0.27-SNAPSHOT - citizens-v1_16_R3 + citizens-v1_16_R2 UTF-8 diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java index 7eaa9d8d9..efcb71bf2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftBat; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBat; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Bat; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBat; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBat; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class BatController extends MobEntityController { public BatController() { @@ -72,7 +72,7 @@ public class BatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 53530c207..a772217fb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftBee; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBee; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Bee; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBee; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBee; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class BeeController extends MobEntityController { public BeeController() { @@ -71,7 +71,7 @@ public class BeeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java index e826890eb..195ea2be8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftBlaze; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Blaze; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBlaze; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBlaze; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class BlazeController extends MobEntityController { public BlazeController() { @@ -71,7 +71,7 @@ public class BlazeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java index efc4efcfb..9c00b3448 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftCat; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCat; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Cat; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityCat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityCat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class CatController extends MobEntityController { public CatController() { @@ -101,7 +101,7 @@ public class CatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index 6e1cff2c2..114768b60 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftCaveSpider; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.CaveSpider; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityCaveSpider; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityCaveSpider; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class CaveSpiderController extends MobEntityController { public CaveSpiderController() { @@ -89,7 +89,7 @@ public class CaveSpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java index a7f57683c..4e277e27b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftChicken; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Chicken; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityChicken; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityChicken; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ChickenController extends MobEntityController { public ChickenController() { @@ -102,7 +102,7 @@ public class ChickenController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java index 4d9a45901..17f797e36 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java @@ -1,38 +1,38 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftCod; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCod; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Cod; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityCod; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityCod; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class CodController extends MobEntityController { public CodController() { @@ -110,7 +110,7 @@ public class CodController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java index b31f2b5a7..e755faf00 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftCow; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCow; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Cow; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityCow; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityCow; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class CowController extends MobEntityController { public CowController() { @@ -117,7 +117,7 @@ public class CowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java index 30a605bdb..922598640 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java @@ -1,33 +1,33 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftCreeper; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Creeper; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityCreeper; -import net.minecraft.server.v1_16_R3.EntityLightning; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityCreeper; +import net.minecraft.server.v1_16_R2.EntityLightning; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class CreeperController extends MobEntityController { public CreeperController() { @@ -92,7 +92,7 @@ public class CreeperController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java index eb2130ad7..1aff8c550 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java @@ -1,35 +1,35 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftDolphin; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDolphin; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Dolphin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityDolphin; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.Navigation; -import net.minecraft.server.v1_16_R3.NavigationAbstract; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityDolphin; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.Navigation; +import net.minecraft.server.v1_16_R2.NavigationAbstract; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class DolphinController extends MobEntityController { public DolphinController() { @@ -106,7 +106,7 @@ public class DolphinController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java index c877a6ce0..ea9e62d95 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftDrowned; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDrowned; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Drowned; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityDrowned; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityDrowned; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class DrownedController extends MobEntityController { public DrownedController() { @@ -89,7 +89,7 @@ public class DrownedController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index 5b303e2c9..72ed464a6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java @@ -1,29 +1,29 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEnderDragon; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.EnderDragon; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityEnderDragon; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityEnderDragon; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class EnderDragonController extends MobEntityController { public EnderDragonController() { @@ -72,7 +72,7 @@ public class EnderDragonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java index 4e718ea62..5c000eb6e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEnderman; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Enderman; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityEnderman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityEnderman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class EndermanController extends MobEntityController { public EndermanController() { @@ -97,7 +97,7 @@ public class EndermanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java index 543b3cec7..1bdc66a36 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEndermite; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEndermite; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Endermite; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityEndermite; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityEndermite; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class EndermiteController extends MobEntityController { public EndermiteController() { @@ -89,7 +89,7 @@ public class EndermiteController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java index 07c6b67a5..bfd293adf 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.io.IOException; import java.lang.invoke.MethodHandle; @@ -9,8 +9,8 @@ import java.util.function.Consumer; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; @@ -28,16 +28,16 @@ import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.trait.trait.Inventory; -import net.citizensnpcs.nms.v1_16_R3.network.EmptyNetHandler; -import net.citizensnpcs.nms.v1_16_R3.network.EmptyNetworkManager; -import net.citizensnpcs.nms.v1_16_R3.network.EmptySocket; -import net.citizensnpcs.nms.v1_16_R3.util.EmptyAdvancementDataPlayer; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerJump; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerLook; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerNavigation; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerlistTracker; +import net.citizensnpcs.nms.v1_16_R2.network.EmptyNetHandler; +import net.citizensnpcs.nms.v1_16_R2.network.EmptyNetworkManager; +import net.citizensnpcs.nms.v1_16_R2.network.EmptySocket; +import net.citizensnpcs.nms.v1_16_R2.util.EmptyAdvancementDataPlayer; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerJump; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerLook; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerNavigation; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerlistTracker; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.skin.SkinPacketTracker; @@ -46,32 +46,32 @@ import net.citizensnpcs.trait.Gravity; import net.citizensnpcs.trait.SkinTrait; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.AttributeBase; -import net.minecraft.server.v1_16_R3.AttributeMapBase; -import net.minecraft.server.v1_16_R3.AttributeModifiable; -import net.minecraft.server.v1_16_R3.AttributeProvider; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ChatComponentText; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EnumGamemode; -import net.minecraft.server.v1_16_R3.EnumItemSlot; -import net.minecraft.server.v1_16_R3.EnumProtocolDirection; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.IChatBaseComponent; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.MinecraftServer; -import net.minecraft.server.v1_16_R3.NavigationAbstract; -import net.minecraft.server.v1_16_R3.NetworkManager; -import net.minecraft.server.v1_16_R3.Packet; -import net.minecraft.server.v1_16_R3.PacketPlayOutEntityEquipment; -import net.minecraft.server.v1_16_R3.PathType; -import net.minecraft.server.v1_16_R3.PlayerInteractManager; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.AttributeBase; +import net.minecraft.server.v1_16_R2.AttributeMapBase; +import net.minecraft.server.v1_16_R2.AttributeModifiable; +import net.minecraft.server.v1_16_R2.AttributeProvider; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ChatComponentText; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.EnumGamemode; +import net.minecraft.server.v1_16_R2.EnumItemSlot; +import net.minecraft.server.v1_16_R2.EnumProtocolDirection; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.IChatBaseComponent; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.MinecraftServer; +import net.minecraft.server.v1_16_R2.NavigationAbstract; +import net.minecraft.server.v1_16_R2.NetworkManager; +import net.minecraft.server.v1_16_R2.Packet; +import net.minecraft.server.v1_16_R2.PacketPlayOutEntityEquipment; +import net.minecraft.server.v1_16_R2.PathType; +import net.minecraft.server.v1_16_R2.PlayerInteractManager; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.WorldServer; public class EntityHumanNPC extends EntityPlayer implements NPCHolder, SkinnableEntity { private final Map bz = Maps.newEnumMap(PathType.class); @@ -137,7 +137,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java index aea5e2f93..698e71b73 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEvoker; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEvoker; import org.bukkit.entity.Evoker; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityEvoker; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityEvoker; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class EvokerController extends MobEntityController { public EvokerController() { @@ -75,7 +75,7 @@ public class EvokerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java index acc49f6ee..e2ff9bcc6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFox; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFox; import org.bukkit.entity.Fox; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityFox; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityFox; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class FoxController extends MobEntityController { public FoxController() { @@ -87,7 +87,7 @@ public class FoxController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java index 20c7a0c46..2c508c7f7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftGhast; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftGhast; import org.bukkit.entity.Ghast; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityGhast; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityGhast; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class GhastController extends MobEntityController { public GhastController() { @@ -57,7 +57,7 @@ public class GhastController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java index a92721111..fd975520f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftGiant; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftGiant; import org.bukkit.entity.Giant; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityGiantZombie; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityGiantZombie; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class GiantController extends MobEntityController { public GiantController() { @@ -75,7 +75,7 @@ public class GiantController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java index 7ce4b6431..1349cb87d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftGuardian; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftGuardian; import org.bukkit.entity.Guardian; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityGuardian; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityGuardian; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class GuardianController extends MobEntityController { public GuardianController() { @@ -75,7 +75,7 @@ public class GuardianController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java index a36833d78..5d6eaae29 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftElderGuardian; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftElderGuardian; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.ElderGuardian; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityGuardianElder; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityGuardianElder; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class GuardianElderController extends MobEntityController { public GuardianElderController() { @@ -75,7 +75,7 @@ public class GuardianElderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java index 2c0170525..3404cbede 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.TreeMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHoglin; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHoglin; import org.bukkit.entity.Hoglin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BehaviorController; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHoglin; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BehaviorController; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHoglin; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class HoglinController extends MobEntityController { public HoglinController() { @@ -80,7 +80,7 @@ public class HoglinController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java index 173de5329..a5b606757 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHorse; import org.bukkit.entity.Horse; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHorse; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHorse; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class HorseController extends MobEntityController { public HorseController() { @@ -112,7 +112,7 @@ public class HorseController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java index 11d810acf..34fa1801c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftDonkey; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDonkey; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Donkey; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHorseDonkey; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHorseDonkey; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class HorseDonkeyController extends MobEntityController { public HorseDonkeyController() { @@ -111,7 +111,7 @@ public class HorseDonkeyController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java index 07699c6c7..eebd11874 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMule; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMule; import org.bukkit.entity.Mule; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHorseMule; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHorseMule; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class HorseMuleController extends MobEntityController { public HorseMuleController() { @@ -111,7 +111,7 @@ public class HorseMuleController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java index ef370669f..45203ec4e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSkeletonHorse; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSkeletonHorse; import org.bukkit.entity.SkeletonHorse; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHorseSkeleton; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHorseSkeleton; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class HorseSkeletonController extends MobEntityController { public HorseSkeletonController() { @@ -112,7 +112,7 @@ public class HorseSkeletonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java index 9cf50ddea..0c0845e22 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftZombieHorse; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftZombieHorse; import org.bukkit.entity.ZombieHorse; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHorseZombie; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHorseZombie; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class HorseZombieController extends MobEntityController { public HorseZombieController() { @@ -112,7 +112,7 @@ public class HorseZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java similarity index 94% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java index 1e66b94d3..bfb7ae173 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java @@ -1,10 +1,10 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.scoreboard.Scoreboard; @@ -20,8 +20,8 @@ import net.citizensnpcs.npc.skin.Skin; import net.citizensnpcs.npc.skin.SkinnableEntity; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.PlayerInteractManager; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.PlayerInteractManager; +import net.minecraft.server.v1_16_R2.WorldServer; public class HumanController extends AbstractEntityController { public HumanController() { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java index ed0333d3a..6ff360213 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftIllusioner; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftIllusioner; import org.bukkit.entity.Illusioner; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityIllagerIllusioner; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityIllagerIllusioner; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class IllusionerController extends MobEntityController { public IllusionerController() { @@ -75,7 +75,7 @@ public class IllusionerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java index 55935e212..4666d2693 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftIronGolem; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftIronGolem; import org.bukkit.entity.IronGolem; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityIronGolem; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityIronGolem; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class IronGolemController extends MobEntityController { public IronGolemController() { @@ -75,7 +75,7 @@ public class IronGolemController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java index 7751fb73e..48c8e5479 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java @@ -1,35 +1,35 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftLlama; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLlama; import org.bukkit.entity.Llama; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityLlama; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityLlama; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class LlamaController extends MobEntityController { public LlamaController() { @@ -98,7 +98,7 @@ public class LlamaController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java index 1becbf567..6f8e0171b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMagmaCube; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMagmaCube; import org.bukkit.entity.MagmaCube; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMagmaCube; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMagmaCube; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class MagmaCubeController extends MobEntityController { public MagmaCubeController() { @@ -82,7 +82,7 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java index 3deec28c6..717466221 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.lang.invoke.MethodHandle; import java.lang.reflect.Constructor; @@ -6,17 +6,17 @@ import java.util.Map; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.entity.Entity; import com.google.common.collect.Maps; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.World; public abstract class MobEntityController extends AbstractEntityController { private final Class clazz; @@ -31,7 +31,7 @@ public abstract class MobEntityController extends AbstractEntityController { @Override protected Entity createEntity(Location at, NPC npc) { EntityTypes type = NMSImpl.getEntityType(clazz); - net.minecraft.server.v1_16_R3.Entity entity = createEntityFromClass(type, + net.minecraft.server.v1_16_R2.Entity entity = createEntityFromClass(type, ((CraftWorld) at.getWorld()).getHandle(), npc); entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); @@ -49,9 +49,9 @@ public abstract class MobEntityController extends AbstractEntityController { return entity.getBukkitEntity(); } - private net.minecraft.server.v1_16_R3.Entity createEntityFromClass(Object... args) { + private net.minecraft.server.v1_16_R2.Entity createEntityFromClass(Object... args) { try { - return (net.minecraft.server.v1_16_R3.Entity) constructor.newInstance(args); + return (net.minecraft.server.v1_16_R2.Entity) constructor.newInstance(args); } catch (Exception ex) { ex.printStackTrace(); return null; @@ -71,6 +71,6 @@ public abstract class MobEntityController extends AbstractEntityController { private static final Map, Constructor> CONSTRUCTOR_CACHE = Maps.newHashMap(); - private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_16_R3.Entity.class, + private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_16_R2.Entity.class, "uniqueID"); } \ No newline at end of file diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java index bd30413a6..94ed68e51 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java @@ -1,35 +1,35 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMushroomCow; import org.bukkit.entity.MushroomCow; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityMushroomCow; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityMushroomCow; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class MushroomCowController extends MobEntityController { @@ -99,7 +99,7 @@ public class MushroomCowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java index 6457e7797..7c018347b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java @@ -1,33 +1,33 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftOcelot; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftOcelot; import org.bukkit.entity.Ocelot; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityOcelot; -import net.minecraft.server.v1_16_R3.EntityPose; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityOcelot; +import net.minecraft.server.v1_16_R2.EntityPose; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class OcelotController extends MobEntityController { public OcelotController() { @@ -89,7 +89,7 @@ public class OcelotController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java index dd4b36b62..5a8f47b10 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPanda; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPanda; import org.bukkit.entity.Panda; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityPanda; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityPanda; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PandaController extends MobEntityController { public PandaController() { @@ -87,7 +87,7 @@ public class PandaController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index f89ef0afb..8a2151332 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftParrot; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftParrot; import org.bukkit.entity.Parrot; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityParrot; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityParrot; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class ParrotController extends MobEntityController { public ParrotController() { @@ -69,7 +69,7 @@ public class ParrotController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java index 34e41fe27..8ac85532c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java @@ -1,36 +1,36 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPhantom; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPhantom; import org.bukkit.entity.Phantom; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerLook; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityPhantom; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumDifficulty; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldDataServer; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerLook; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityPhantom; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumDifficulty; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldDataServer; public class PhantomController extends MobEntityController { public PhantomController() { @@ -88,7 +88,7 @@ public class PhantomController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java index af0b199c0..abd4426fd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPig; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPig; import org.bukkit.entity.Pig; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityLightning; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityPig; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityLightning; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityPig; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class PigController extends MobEntityController { public PigController() { @@ -90,7 +90,7 @@ public class PigController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java index b4d3e16eb..7e068641a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPigZombie; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPigZombie; import org.bukkit.entity.PigZombie; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityPigZombie; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityPigZombie; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PigZombieController extends MobEntityController { @@ -76,7 +76,7 @@ public class PigZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java index 02b134969..fb3a651ec 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.TreeMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPiglinBrute; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPiglinBrute; import org.bukkit.entity.PiglinBrute; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BehaviorController; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityPiglinBrute; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BehaviorController; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityPiglinBrute; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PiglinBruteController extends MobEntityController { public PiglinBruteController() { @@ -80,7 +80,7 @@ public class PiglinBruteController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java index 0d8ec1b2b..08f30f172 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.TreeMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPiglin; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPiglin; import org.bukkit.entity.Piglin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BehaviorController; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityPiglin; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BehaviorController; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityPiglin; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PiglinController extends MobEntityController { public PiglinController() { @@ -80,7 +80,7 @@ public class PiglinController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java index b42c06bf6..5d42e149b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPillager; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPillager; import org.bukkit.entity.Pillager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityPillager; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityPillager; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PillagerController extends MobEntityController { public PillagerController() { @@ -87,7 +87,7 @@ public class PillagerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index b691eb7fa..dec6ffae8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java @@ -1,29 +1,29 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPolarBear; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPolarBear; import org.bukkit.entity.PolarBear; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityPolarBear; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityPolarBear; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class PolarBearController extends MobEntityController { public PolarBearController() { @@ -71,7 +71,7 @@ public class PolarBearController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java index 5d1a1c9d7..af6261727 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java @@ -1,41 +1,41 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPufferFish; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPufferFish; import org.bukkit.entity.PufferFish; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.versioned.PufferFishTrait; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityPose; -import net.minecraft.server.v1_16_R3.EntityPufferFish; -import net.minecraft.server.v1_16_R3.EntitySize; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityPose; +import net.minecraft.server.v1_16_R2.EntityPufferFish; +import net.minecraft.server.v1_16_R2.EntitySize; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PufferFishController extends MobEntityController { public PufferFishController() { @@ -107,7 +107,7 @@ public class PufferFishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java index d9c5e14aa..ca98829e1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftRabbit; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftRabbit; import org.bukkit.entity.Rabbit; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_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.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityLiving; -import net.minecraft.server.v1_16_R3.EntityRabbit; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityLiving; +import net.minecraft.server.v1_16_R2.EntityRabbit; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class RabbitController extends MobEntityController { public RabbitController() { @@ -91,7 +91,7 @@ public class RabbitController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java index b9489d1a9..b8cd2c6ad 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftRavager; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftRavager; import org.bukkit.entity.Ravager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityRavager; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityRavager; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class RavagerController extends MobEntityController { public RavagerController() { @@ -87,7 +87,7 @@ public class RavagerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java index 427f81603..0e9374b82 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java @@ -1,38 +1,38 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSalmon; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSalmon; import org.bukkit.entity.Salmon; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntitySalmon; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntitySalmon; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SalmonController extends MobEntityController { public SalmonController() { @@ -96,7 +96,7 @@ public class SalmonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java index 9de8a99ff..f8fe1a567 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSheep; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSheep; import org.bukkit.entity.Sheep; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySheep; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySheep; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SheepController extends MobEntityController { public SheepController() { @@ -89,7 +89,7 @@ public class SheepController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java index cf2b33a10..8bfefaa3d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftShulker; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftShulker; import org.bukkit.entity.Shulker; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityAIBodyControl; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityShulker; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityAIBodyControl; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityShulker; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ShulkerController extends MobEntityController { public ShulkerController() { @@ -76,7 +76,7 @@ public class ShulkerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java index f600915ab..52e8d3842 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSilverfish; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSilverfish; import org.bukkit.entity.Silverfish; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySilverfish; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySilverfish; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SilverfishController extends MobEntityController { public SilverfishController() { @@ -75,7 +75,7 @@ public class SilverfishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java index 90b5e7542..5ad563bc2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSkeleton; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSkeleton; import org.bukkit.entity.Skeleton; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySkeleton; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySkeleton; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SkeletonController extends MobEntityController { public SkeletonController() { @@ -75,7 +75,7 @@ public class SkeletonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java index 7a9f5a3c6..e4254b096 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftStray; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftStray; import org.bukkit.entity.Stray; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySkeletonStray; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySkeletonStray; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SkeletonStrayController extends MobEntityController { public SkeletonStrayController() { @@ -75,7 +75,7 @@ public class SkeletonStrayController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java index 0a7c70c17..6ca6409fb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWitherSkeleton; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWitherSkeleton; import org.bukkit.entity.WitherSkeleton; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySkeletonWither; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySkeletonWither; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SkeletonWitherController extends MobEntityController { public SkeletonWitherController() { @@ -75,7 +75,7 @@ public class SkeletonWitherController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java index e37a36ce4..9ed68f898 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSlime; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSlime; import org.bukkit.entity.Slime; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntitySlime; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntitySlime; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SlimeController extends MobEntityController { public SlimeController() { @@ -82,7 +82,7 @@ public class SlimeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java index 0b9015666..1ee82ee2e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSnowman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSnowman; import org.bukkit.entity.Snowman; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySnowman; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GameRules; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySnowman; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GameRules; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SnowmanController extends MobEntityController { public SnowmanController() { @@ -76,7 +76,7 @@ public class SnowmanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java index a6bce517d..974bb92a2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSpider; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSpider; import org.bukkit.entity.Spider; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySpider; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySpider; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SpiderController extends MobEntityController { public SpiderController() { @@ -75,7 +75,7 @@ public class SpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java index a6b0f6b45..32cc3aa6a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSquid; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSquid; import org.bukkit.entity.Squid; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntitySquid; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntitySquid; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class SquidController extends MobEntityController { public SquidController() { @@ -75,7 +75,7 @@ public class SquidController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java index 9c898f33d..86074827f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftStrider; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftStrider; import org.bukkit.entity.Strider; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityStrider; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityStrider; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class StriderController extends MobEntityController { public StriderController() { @@ -75,7 +75,7 @@ public class StriderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java index 70532e068..9c0288a70 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.lang.invoke.MethodHandle; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTraderLlama; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTraderLlama; import org.bukkit.entity.TraderLlama; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityLlamaTrader; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityLlamaTrader; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class TraderLlamaController extends MobEntityController { public TraderLlamaController() { @@ -101,7 +101,7 @@ public class TraderLlamaController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java index feb7f7fe0..092e8d3f2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java @@ -1,38 +1,38 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTropicalFish; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTropicalFish; import org.bukkit.entity.TropicalFish; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTropicalFish; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTropicalFish; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class TropicalFishController extends MobEntityController { public TropicalFishController() { @@ -96,7 +96,7 @@ public class TropicalFishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java index 90de644e9..4e45fc39e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java @@ -1,37 +1,37 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTurtle; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTurtle; import org.bukkit.entity.Turtle; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.citizensnpcs.nms.v1_16_R3.util.PlayerControllerMove; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ControllerJump; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTurtle; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.Navigation; -import net.minecraft.server.v1_16_R3.NavigationAbstract; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ControllerJump; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityInsentient; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTurtle; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.Navigation; +import net.minecraft.server.v1_16_R2.NavigationAbstract; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class TurtleController extends MobEntityController { public TurtleController() { @@ -95,7 +95,7 @@ public class TurtleController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index cd0652ebc..0f85a54ef 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVex; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVex; import org.bukkit.entity.Vex; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityVex; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityVex; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class VexController extends MobEntityController { public VexController() { @@ -58,7 +58,7 @@ public class VexController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java index a9d616d9b..9076cea08 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java @@ -1,43 +1,43 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.List; import java.util.TreeMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVillager; import org.bukkit.entity.Villager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BehaviorController; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityLightning; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityVillager; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.MerchantRecipe; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.BehaviorController; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityLightning; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityVillager; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.MerchantRecipe; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class VillagerController extends MobEntityController { public VillagerController() { @@ -116,7 +116,7 @@ public class VillagerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java index 4b797cc1e..99ad293be 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java @@ -1,32 +1,32 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVindicator; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVindicator; import org.bukkit.entity.Vindicator; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityVindicator; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityVindicator; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class VindicatorController extends MobEntityController { public VindicatorController() { @@ -89,7 +89,7 @@ public class VindicatorController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java index 448f3b9e8..fe3c66630 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java @@ -1,41 +1,41 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.List; import java.util.TreeMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWanderingTrader; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWanderingTrader; import org.bukkit.entity.WanderingTrader; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityLightning; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityVillagerTrader; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.MerchantRecipe; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityLightning; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityVillagerTrader; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.MerchantRecipe; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class WanderingTraderController extends MobEntityController { public WanderingTraderController() { @@ -112,7 +112,7 @@ public class WanderingTraderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java index e79efccfa..7f54058e0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWitch; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWitch; import org.bukkit.entity.Witch; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityWitch; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityWitch; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class WitchController extends MobEntityController { public WitchController() { @@ -75,7 +75,7 @@ public class WitchController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java index d94e8dbf5..5a9a3aeaa 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWither; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWither; import org.bukkit.entity.Wither; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityWither; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityWither; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.World; public class WitherController extends MobEntityController { public WitherController() { @@ -57,7 +57,7 @@ public class WitherController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java index bdba669cf..4566d3aa4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java @@ -1,10 +1,10 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWolf; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWolf; import org.bukkit.entity.Wolf; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.util.Vector; @@ -12,23 +12,23 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityLiving; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityWolf; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityLiving; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityWolf; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class WolfController extends MobEntityController { public WolfController() { @@ -91,7 +91,7 @@ public class WolfController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java index 7f3eca94e..5b0bc2ebb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java @@ -1,34 +1,34 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import java.util.TreeMap; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftZoglin; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftZoglin; import org.bukkit.entity.Zoglin; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BehaviorController; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityZoglin; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BehaviorController; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityZoglin; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ZoglinController extends MobEntityController { public ZoglinController() { @@ -80,7 +80,7 @@ public class ZoglinController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java index 4e520edd2..3c12cea43 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftZombie; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftZombie; import org.bukkit.entity.Zombie; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityZombie; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityZombie; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ZombieController extends MobEntityController { public ZombieController() { @@ -75,7 +75,7 @@ public class ZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java index 8880fd965..9cc36c328 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHusk; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHusk; import org.bukkit.entity.Husk; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityZombieHusk; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityZombieHusk; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ZombieHuskController extends MobEntityController { public ZombieHuskController() { @@ -75,7 +75,7 @@ public class ZombieHuskController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java index 3ddd6512e..a178e8441 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity; +package net.citizensnpcs.nms.v1_16_R2.entity; import org.bukkit.Bukkit; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVillagerZombie; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVillagerZombie; import org.bukkit.entity.ZombieVillager; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityZombieVillager; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityZombieVillager; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ZombieVillagerController extends MobEntityController { public ZombieVillagerController() { @@ -75,7 +75,7 @@ public class ZombieVillagerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java index d3b8ba23c..019e9724e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftAreaEffectCloud; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftAreaEffectCloud; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.AreaEffectCloud; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityAreaEffectCloud; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityAreaEffectCloud; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class AreaEffectCloudController extends MobEntityController { public AreaEffectCloudController() { @@ -57,7 +57,7 @@ public class AreaEffectCloudController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java index 9940d8e9b..bfe5a739b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ArmorStandController.java @@ -1,9 +1,9 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftArmorStand; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftArmorStand; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerInteractEntityEvent; @@ -11,19 +11,19 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityArmorStand; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityArmorStand; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class ArmorStandController extends MobEntityController { public ArmorStandController() { @@ -73,7 +73,7 @@ public class ArmorStandController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java similarity index 90% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java index 5de6c7765..51bad1461 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java @@ -1,31 +1,31 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftBoat; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Boat; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.AxisAlignedBB; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.EntityBoat; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumMoveType; -import net.minecraft.server.v1_16_R3.Fluid; -import net.minecraft.server.v1_16_R3.MathHelper; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.TagsFluid; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.AxisAlignedBB; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.EntityBoat; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumMoveType; +import net.minecraft.server.v1_16_R2.Fluid; +import net.minecraft.server.v1_16_R2.MathHelper; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.TagsFluid; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class BoatController extends MobEntityController { public BoatController() { @@ -70,7 +70,7 @@ public class BoatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java index f40fa1a35..f8b81a86c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftDragonFireball; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDragonFireball; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.DragonFireball; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityDragonFireball; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityDragonFireball; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class DragonFireballController extends MobEntityController { public DragonFireballController() { @@ -56,7 +56,7 @@ public class DragonFireballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java index b84fc40fc..ca33bface 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java @@ -1,27 +1,27 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEgg; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEgg; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Egg; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityEgg; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.EntityEgg; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class EggController extends AbstractEntityController { public EggController() { @@ -72,7 +72,7 @@ public class EggController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java index 2bb3bbe68..cd2a98400 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEnderCrystal; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderCrystal; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.EnderCrystal; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityEnderCrystal; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityEnderCrystal; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class EnderCrystalController extends MobEntityController { public EnderCrystalController() { @@ -57,7 +57,7 @@ public class EnderCrystalController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java index e34f18763..9d964d414 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEnderPearl; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderPearl; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.EnderPearl; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityEnderPearl; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityEnderPearl; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class EnderPearlController extends MobEntityController { public EnderPearlController() { @@ -57,7 +57,7 @@ public class EnderPearlController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java index 97c0644d8..c8378e3d7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEnderSignal; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderSignal; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.EnderSignal; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityEnderSignal; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityEnderSignal; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class EnderSignalController extends MobEntityController { public EnderSignalController() { @@ -56,7 +56,7 @@ public class EnderSignalController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java index 7f947af78..db9bb064d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java @@ -1,9 +1,9 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEvokerFangs; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEvokerFangs; import org.bukkit.entity.EvokerFangs; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerInteractEntityEvent; @@ -11,19 +11,19 @@ import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityEvokerFangs; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.EnumInteractionResult; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityEvokerFangs; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.EnumInteractionResult; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class EvokerFangsController extends MobEntityController { public EvokerFangsController() { @@ -59,7 +59,7 @@ public class EvokerFangsController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java index 0b3ac74f9..d11f3f6b1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftExperienceOrb; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftExperienceOrb; import org.bukkit.entity.ExperienceOrb; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityExperienceOrb; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityExperienceOrb; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class ExperienceOrbController extends MobEntityController { public ExperienceOrbController() { @@ -43,7 +43,7 @@ public class ExperienceOrbController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java index 149e140ab..4990ad80b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java @@ -1,13 +1,13 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFallingBlock; -import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFallingBlock; +import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; @@ -16,21 +16,21 @@ import net.citizensnpcs.api.event.DespawnReason; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.Block; -import net.minecraft.server.v1_16_R3.Blocks; -import net.minecraft.server.v1_16_R3.EntityFallingBlock; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumMoveType; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.Block; +import net.minecraft.server.v1_16_R2.Blocks; +import net.minecraft.server.v1_16_R2.EntityFallingBlock; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumMoveType; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class FallingBlockController extends AbstractEntityController { public FallingBlockController() { @@ -75,7 +75,7 @@ public class FallingBlockController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java index e15d24db2..26feabec3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFirework; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFirework; import org.bukkit.entity.Firework; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityFireworks; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityFireworks; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class FireworkController extends MobEntityController { public FireworkController() { @@ -43,7 +43,7 @@ public class FireworkController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java index f3bf8c293..72c46f553 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import java.lang.invoke.MethodHandle; import java.util.UUID; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFishHook; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFishHook; import org.bukkit.entity.FishHook; import org.bukkit.util.Vector; @@ -14,23 +14,23 @@ import com.mojang.authlib.GameProfile; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_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.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityFishingHook; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.PlayerInteractManager; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityFishingHook; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.PlayerInteractManager; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class FishingHookController extends MobEntityController { public FishingHookController() { @@ -58,7 +58,7 @@ public class FishingHookController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java index 46d786246..ebce2550c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java @@ -1,13 +1,13 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftItem; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftItem; +import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.Item; import org.bukkit.util.Vector; @@ -16,18 +16,18 @@ import net.citizensnpcs.api.event.DespawnReason; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityItem; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityItem; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class ItemController extends AbstractEntityController { public ItemController() { @@ -66,7 +66,7 @@ public class ItemController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java index 6d458cb3e..e836f32fd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftItemFrame; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftItemFrame; import org.bukkit.entity.Entity; import org.bukkit.entity.ItemFrame; import org.bukkit.util.Vector; @@ -20,12 +20,12 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.EntityItemFrame; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EnumDirection; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.EntityItemFrame; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EnumDirection; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class ItemFrameController extends MobEntityController { public ItemFrameController() { @@ -59,7 +59,7 @@ public class ItemFrameController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java index 01acc920c..08faf6623 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftLargeFireball; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLargeFireball; import org.bukkit.entity.LargeFireball; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityLargeFireball; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityLargeFireball; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class LargeFireballController extends MobEntityController { public LargeFireballController() { @@ -42,7 +42,7 @@ public class LargeFireballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java index b58e54927..58dbbda87 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftLeash; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLeash; import org.bukkit.entity.LeashHitch; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityLeash; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityLeash; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class LeashController extends MobEntityController { public LeashController() { @@ -43,7 +43,7 @@ public class LeashController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java index 95f2bddc4..daa454125 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java @@ -1,28 +1,28 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftLlamaSpit; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLlamaSpit; import org.bukkit.entity.Entity; import org.bukkit.entity.LlamaSpit; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityLlama; -import net.minecraft.server.v1_16_R3.EntityLlamaSpit; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.EntityLlama; +import net.minecraft.server.v1_16_R2.EntityLlamaSpit; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; +import net.minecraft.server.v1_16_R2.WorldServer; public class LlamaSpitController extends AbstractEntityController { public LlamaSpitController() { @@ -61,7 +61,7 @@ public class LlamaSpitController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java index 6b27a2980..0bbaac4a0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMinecartChest; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartChest; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartChest; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartChest; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartChestController extends MobEntityController { public MinecartChestController() { @@ -42,7 +42,7 @@ public class MinecartChestController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java index 4b6e5f37e..f703cfba5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMinecartCommand; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartCommand; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartCommandBlock; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartCommandBlock; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartCommandController extends MobEntityController { public MinecartCommandController() { @@ -42,7 +42,7 @@ public class MinecartCommandController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java index c92b912af..8c81278f9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMinecartFurnace; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartFurnace; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartFurnace; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartFurnace; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartFurnaceController extends MobEntityController { public MinecartFurnaceController() { @@ -42,7 +42,7 @@ public class MinecartFurnaceController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java index 4b70842f8..249586462 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java @@ -1,19 +1,19 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartHopper; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartHopper; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartHopperController extends MobEntityController { public MinecartHopperController() { @@ -38,7 +38,7 @@ public class MinecartHopperController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java index 0a22178eb..80ef65b42 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMinecartRideable; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartRideable; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartRideable; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartRideable; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartRideableController extends MobEntityController { public MinecartRideableController() { @@ -42,7 +42,7 @@ public class MinecartRideableController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java index 38f058813..436981256 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java @@ -1,19 +1,19 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartMobSpawner; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartMobSpawner; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartSpawnerController extends MobEntityController { public MinecartSpawnerController() { @@ -38,7 +38,7 @@ public class MinecartSpawnerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java index 55b9cc057..2b40fe4f7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java @@ -1,19 +1,19 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityMinecartTNT; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityMinecartTNT; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class MinecartTNTController extends MobEntityController { public MinecartTNTController() { @@ -38,7 +38,7 @@ public class MinecartTNTController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java index 51524768d..9665a3a12 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPainting; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPainting; import org.bukkit.entity.Painting; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityPainting; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityPainting; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class PaintingController extends MobEntityController { public PaintingController() { @@ -43,7 +43,7 @@ public class PaintingController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java index 6de45813f..6a506b782 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftShulkerBullet; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftShulkerBullet; import org.bukkit.entity.ShulkerBullet; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityShulkerBullet; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityShulkerBullet; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class ShulkerBulletController extends MobEntityController { public ShulkerBulletController() { @@ -43,7 +43,7 @@ public class ShulkerBulletController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java index ba7e7a71c..5326ab8ff 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSmallFireball; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSmallFireball; import org.bukkit.entity.SmallFireball; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntitySmallFireball; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntitySmallFireball; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class SmallFireballController extends MobEntityController { public SmallFireballController() { @@ -43,7 +43,7 @@ public class SmallFireballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java index 63ecb1f01..ab15d4b46 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSnowball; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSnowball; import org.bukkit.entity.Snowball; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntitySnowball; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntitySnowball; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class SnowballController extends MobEntityController { public SnowballController() { @@ -43,7 +43,7 @@ public class SnowballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java index 73ff9c066..94f82231b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftArrow; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.entity.Arrow; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntitySpectralArrow; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntitySpectralArrow; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class SpectralArrowController extends MobEntityController { public SpectralArrowController() { @@ -43,7 +43,7 @@ public class SpectralArrowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java index 0510efafb..6d608a872 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTNTPrimed; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTNTPrimed; import org.bukkit.entity.TNTPrimed; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityTNTPrimed; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityTNTPrimed; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class TNTPrimedController extends MobEntityController { public TNTPrimedController() { @@ -43,7 +43,7 @@ public class TNTPrimedController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java index 3aa2bc5b2..45e023870 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftThrownExpBottle; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftThrownExpBottle; import org.bukkit.entity.ThrownExpBottle; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityThrownExpBottle; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityThrownExpBottle; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class ThrownExpBottleController extends MobEntityController { public ThrownExpBottleController() { @@ -43,7 +43,7 @@ public class ThrownExpBottleController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java similarity index 85% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java index fdf9a0e2c..2b5613906 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftThrownPotion; import org.bukkit.entity.ThrownPotion; import org.bukkit.util.Vector; @@ -15,11 +15,11 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityPotion; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.Items; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityPotion; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class ThrownPotionController extends MobEntityController { public ThrownPotionController() { @@ -44,7 +44,7 @@ public class ThrownPotionController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java index 41fe30670..ad25d5ff4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTrident; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident; import org.bukkit.entity.Trident; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityThrownTrident; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityThrownTrident; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class ThrownTridentController extends MobEntityController { public ThrownTridentController() { @@ -43,7 +43,7 @@ public class ThrownTridentController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java index 6b22d20da..9bec7c837 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java @@ -1,23 +1,23 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTippedArrow; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTippedArrow; import org.bukkit.entity.Arrow; import org.bukkit.util.Vector; import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityTippedArrow; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityTippedArrow; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class TippedArrowController extends MobEntityController { public TippedArrowController() { @@ -42,7 +42,7 @@ public class TippedArrowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java similarity index 84% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java index bbf00e01d..dc009e498 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.entity.nonliving; +package net.citizensnpcs.nms.v1_16_R2.entity.nonliving; -import net.citizensnpcs.nms.v1_16_R3.entity.MobEntityController; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; +import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWitherSkull; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWitherSkull; import org.bukkit.entity.WitherSkull; import org.bukkit.util.Vector; @@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityWitherSkull; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.World; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityWitherSkull; +import net.minecraft.server.v1_16_R2.NBTTagCompound; +import net.minecraft.server.v1_16_R2.World; public class WitherSkullController extends MobEntityController { public WitherSkullController() { @@ -43,7 +43,7 @@ public class WitherSkullController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_16_R3.Entity entity) { + public void collide(net.minecraft.server.v1_16_R2.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java similarity index 97% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java index cf8d8d28a..613811f65 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyChannel.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.network; +package net.citizensnpcs.nms.v1_16_R2.network; import java.net.SocketAddress; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java similarity index 50% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java index 270b8ab1c..a909171a8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetHandler.java @@ -1,10 +1,10 @@ -package net.citizensnpcs.nms.v1_16_R3.network; +package net.citizensnpcs.nms.v1_16_R2.network; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.MinecraftServer; -import net.minecraft.server.v1_16_R3.NetworkManager; -import net.minecraft.server.v1_16_R3.Packet; -import net.minecraft.server.v1_16_R3.PlayerConnection; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.MinecraftServer; +import net.minecraft.server.v1_16_R2.NetworkManager; +import net.minecraft.server.v1_16_R2.Packet; +import net.minecraft.server.v1_16_R2.PlayerConnection; public class EmptyNetHandler extends PlayerConnection { public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java similarity index 65% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java index a52c1a9ca..bdd99d42f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptyNetworkManager.java @@ -1,12 +1,12 @@ -package net.citizensnpcs.nms.v1_16_R3.network; +package net.citizensnpcs.nms.v1_16_R2.network; import java.io.IOException; import io.netty.util.concurrent.GenericFutureListener; -import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl; -import net.minecraft.server.v1_16_R3.EnumProtocolDirection; -import net.minecraft.server.v1_16_R3.NetworkManager; -import net.minecraft.server.v1_16_R3.Packet; +import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl; +import net.minecraft.server.v1_16_R2.EnumProtocolDirection; +import net.minecraft.server.v1_16_R2.NetworkManager; +import net.minecraft.server.v1_16_R2.Packet; public class EmptyNetworkManager extends NetworkManager { public EmptyNetworkManager(EnumProtocolDirection flag) throws IOException { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java similarity index 90% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java index 5899d1777..67d11e86e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/network/EmptySocket.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.network; +package net.citizensnpcs.nms.v1_16_R2.network; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java similarity index 99% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java index 319863204..7b091f31a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.trait; +package net.citizensnpcs.nms.v1_16_R2.trait; import java.util.List; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java similarity index 88% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java index c0760d0ea..c1c70651b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java @@ -1,8 +1,8 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; import org.bukkit.entity.Player; import net.citizensnpcs.api.ai.tree.BehaviorStatus; @@ -12,18 +12,18 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.PlayerAnimation; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.Blocks; -import net.minecraft.server.v1_16_R3.EnchantmentManager; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityLiving; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EnumItemSlot; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.MobEffects; -import net.minecraft.server.v1_16_R3.TagsFluid; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.Blocks; +import net.minecraft.server.v1_16_R2.EnchantmentManager; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityLiving; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.EnumItemSlot; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.ItemStack; +import net.minecraft.server.v1_16_R2.MobEffects; +import net.minecraft.server.v1_16_R2.TagsFluid; +import net.minecraft.server.v1_16_R2.WorldServer; public class CitizensBlockBreaker extends BlockBreaker { private final BlockBreakerConfiguration configuration; @@ -52,7 +52,7 @@ public class CitizensBlockBreaker extends BlockBreaker { + Math.pow(entity.locZ() - z, 2); } - private net.minecraft.server.v1_16_R3.ItemStack getCurrentItem() { + private net.minecraft.server.v1_16_R2.ItemStack getCurrentItem() { return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item()) : entity instanceof EntityLiving ? ((EntityLiving) entity).getEquipment(EnumItemSlot.MAINHAND) : null; } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java similarity index 99% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java index d8014bf4b..402402f32 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.lang.invoke.MethodHandle; import java.util.Iterator; @@ -13,7 +13,7 @@ import com.google.common.collect.Maps; import com.mojang.serialization.Lifecycle; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_16_R3.*; +import net.minecraft.server.v1_16_R2.*; @SuppressWarnings("rawtypes") public class CustomEntityRegistry extends RegistryBlocks { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java index 4b8176f37..defb4bb6f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.io.File; import java.lang.invoke.MethodHandle; @@ -7,12 +7,12 @@ import java.util.Set; import com.mojang.datafixers.DataFixer; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_16_R3.Advancement; -import net.minecraft.server.v1_16_R3.AdvancementDataPlayer; -import net.minecraft.server.v1_16_R3.AdvancementDataWorld; -import net.minecraft.server.v1_16_R3.AdvancementProgress; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.PlayerList; +import net.minecraft.server.v1_16_R2.Advancement; +import net.minecraft.server.v1_16_R2.AdvancementDataPlayer; +import net.minecraft.server.v1_16_R2.AdvancementDataWorld; +import net.minecraft.server.v1_16_R2.AdvancementProgress; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.PlayerList; public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer { public EmptyAdvancementDataPlayer(DataFixer datafixer, PlayerList playerlist, diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java index 03be1fba0..48c066758 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSBoundingBox.java @@ -1,7 +1,7 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import net.citizensnpcs.api.util.BoundingBox; -import net.minecraft.server.v1_16_R3.AxisAlignedBB; +import net.minecraft.server.v1_16_R2.AxisAlignedBB; public class NMSBoundingBox { private NMSBoundingBox() { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java similarity index 87% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index ce82d8504..cdb32621a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; @@ -24,15 +24,15 @@ import org.bukkit.block.data.BlockData; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; import org.bukkit.boss.BossBar; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.CraftSound; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock; -import org.bukkit.craftbukkit.v1_16_R3.boss.CraftBossBar; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftWither; -import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.CraftSound; +import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_16_R2.boss.CraftBossBar; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWither; +import org.bukkit.craftbukkit.v1_16_R2.event.CraftEventFactory; import org.bukkit.entity.EntityType; import org.bukkit.entity.FishHook; import org.bukkit.entity.LivingEntity; @@ -73,114 +73,114 @@ import net.citizensnpcs.api.npc.NPCRegistry; import net.citizensnpcs.api.trait.TraitInfo; import net.citizensnpcs.api.util.BoundingBox; import net.citizensnpcs.api.util.Messaging; -import net.citizensnpcs.nms.v1_16_R3.entity.BatController; -import net.citizensnpcs.nms.v1_16_R3.entity.BeeController; -import net.citizensnpcs.nms.v1_16_R3.entity.BlazeController; -import net.citizensnpcs.nms.v1_16_R3.entity.CatController; -import net.citizensnpcs.nms.v1_16_R3.entity.CaveSpiderController; -import net.citizensnpcs.nms.v1_16_R3.entity.ChickenController; -import net.citizensnpcs.nms.v1_16_R3.entity.CodController; -import net.citizensnpcs.nms.v1_16_R3.entity.CowController; -import net.citizensnpcs.nms.v1_16_R3.entity.CreeperController; -import net.citizensnpcs.nms.v1_16_R3.entity.DolphinController; -import net.citizensnpcs.nms.v1_16_R3.entity.DrownedController; -import net.citizensnpcs.nms.v1_16_R3.entity.EnderDragonController; -import net.citizensnpcs.nms.v1_16_R3.entity.EndermanController; -import net.citizensnpcs.nms.v1_16_R3.entity.EndermiteController; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; -import net.citizensnpcs.nms.v1_16_R3.entity.EvokerController; -import net.citizensnpcs.nms.v1_16_R3.entity.FoxController; -import net.citizensnpcs.nms.v1_16_R3.entity.GhastController; -import net.citizensnpcs.nms.v1_16_R3.entity.GiantController; -import net.citizensnpcs.nms.v1_16_R3.entity.GuardianController; -import net.citizensnpcs.nms.v1_16_R3.entity.GuardianElderController; -import net.citizensnpcs.nms.v1_16_R3.entity.HoglinController; -import net.citizensnpcs.nms.v1_16_R3.entity.HorseController; -import net.citizensnpcs.nms.v1_16_R3.entity.HorseDonkeyController; -import net.citizensnpcs.nms.v1_16_R3.entity.HorseMuleController; -import net.citizensnpcs.nms.v1_16_R3.entity.HorseSkeletonController; -import net.citizensnpcs.nms.v1_16_R3.entity.HorseZombieController; -import net.citizensnpcs.nms.v1_16_R3.entity.HumanController; -import net.citizensnpcs.nms.v1_16_R3.entity.IllusionerController; -import net.citizensnpcs.nms.v1_16_R3.entity.IronGolemController; -import net.citizensnpcs.nms.v1_16_R3.entity.LlamaController; -import net.citizensnpcs.nms.v1_16_R3.entity.MagmaCubeController; -import net.citizensnpcs.nms.v1_16_R3.entity.MushroomCowController; -import net.citizensnpcs.nms.v1_16_R3.entity.OcelotController; -import net.citizensnpcs.nms.v1_16_R3.entity.PandaController; -import net.citizensnpcs.nms.v1_16_R3.entity.ParrotController; -import net.citizensnpcs.nms.v1_16_R3.entity.PhantomController; -import net.citizensnpcs.nms.v1_16_R3.entity.PigController; -import net.citizensnpcs.nms.v1_16_R3.entity.PigZombieController; -import net.citizensnpcs.nms.v1_16_R3.entity.PiglinBruteController; -import net.citizensnpcs.nms.v1_16_R3.entity.PiglinController; -import net.citizensnpcs.nms.v1_16_R3.entity.PillagerController; -import net.citizensnpcs.nms.v1_16_R3.entity.PolarBearController; -import net.citizensnpcs.nms.v1_16_R3.entity.PufferFishController; -import net.citizensnpcs.nms.v1_16_R3.entity.RabbitController; -import net.citizensnpcs.nms.v1_16_R3.entity.RavagerController; -import net.citizensnpcs.nms.v1_16_R3.entity.SalmonController; -import net.citizensnpcs.nms.v1_16_R3.entity.SheepController; -import net.citizensnpcs.nms.v1_16_R3.entity.ShulkerController; -import net.citizensnpcs.nms.v1_16_R3.entity.SilverfishController; -import net.citizensnpcs.nms.v1_16_R3.entity.SkeletonController; -import net.citizensnpcs.nms.v1_16_R3.entity.SkeletonStrayController; -import net.citizensnpcs.nms.v1_16_R3.entity.SkeletonWitherController; -import net.citizensnpcs.nms.v1_16_R3.entity.SlimeController; -import net.citizensnpcs.nms.v1_16_R3.entity.SnowmanController; -import net.citizensnpcs.nms.v1_16_R3.entity.SpiderController; -import net.citizensnpcs.nms.v1_16_R3.entity.SquidController; -import net.citizensnpcs.nms.v1_16_R3.entity.StriderController; -import net.citizensnpcs.nms.v1_16_R3.entity.TraderLlamaController; -import net.citizensnpcs.nms.v1_16_R3.entity.TropicalFishController; -import net.citizensnpcs.nms.v1_16_R3.entity.TurtleController; -import net.citizensnpcs.nms.v1_16_R3.entity.VexController; -import net.citizensnpcs.nms.v1_16_R3.entity.VillagerController; -import net.citizensnpcs.nms.v1_16_R3.entity.VindicatorController; -import net.citizensnpcs.nms.v1_16_R3.entity.WanderingTraderController; -import net.citizensnpcs.nms.v1_16_R3.entity.WitchController; -import net.citizensnpcs.nms.v1_16_R3.entity.WitherController; -import net.citizensnpcs.nms.v1_16_R3.entity.WolfController; -import net.citizensnpcs.nms.v1_16_R3.entity.ZoglinController; -import net.citizensnpcs.nms.v1_16_R3.entity.ZombieController; -import net.citizensnpcs.nms.v1_16_R3.entity.ZombieHuskController; -import net.citizensnpcs.nms.v1_16_R3.entity.ZombieVillagerController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.AreaEffectCloudController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ArmorStandController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.BoatController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.DragonFireballController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.EggController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.EnderCrystalController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.EnderPearlController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.EnderSignalController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.EvokerFangsController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.FallingBlockController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.FireworkController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.FishingHookController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ItemController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ItemFrameController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.LargeFireballController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.LeashController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.LlamaSpitController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartChestController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartCommandController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartFurnaceController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartHopperController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartRideableController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.MinecartTNTController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.PaintingController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ShulkerBulletController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.SmallFireballController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.SnowballController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.SpectralArrowController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.TNTPrimedController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ThrownExpBottleController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ThrownPotionController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.ThrownTridentController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.TippedArrowController; -import net.citizensnpcs.nms.v1_16_R3.entity.nonliving.WitherSkullController; -import net.citizensnpcs.nms.v1_16_R3.network.EmptyChannel; -import net.citizensnpcs.nms.v1_16_R3.trait.Commands; +import net.citizensnpcs.nms.v1_16_R2.entity.BatController; +import net.citizensnpcs.nms.v1_16_R2.entity.BeeController; +import net.citizensnpcs.nms.v1_16_R2.entity.BlazeController; +import net.citizensnpcs.nms.v1_16_R2.entity.CatController; +import net.citizensnpcs.nms.v1_16_R2.entity.CaveSpiderController; +import net.citizensnpcs.nms.v1_16_R2.entity.ChickenController; +import net.citizensnpcs.nms.v1_16_R2.entity.CodController; +import net.citizensnpcs.nms.v1_16_R2.entity.CowController; +import net.citizensnpcs.nms.v1_16_R2.entity.CreeperController; +import net.citizensnpcs.nms.v1_16_R2.entity.DolphinController; +import net.citizensnpcs.nms.v1_16_R2.entity.DrownedController; +import net.citizensnpcs.nms.v1_16_R2.entity.EnderDragonController; +import net.citizensnpcs.nms.v1_16_R2.entity.EndermanController; +import net.citizensnpcs.nms.v1_16_R2.entity.EndermiteController; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_16_R2.entity.EvokerController; +import net.citizensnpcs.nms.v1_16_R2.entity.FoxController; +import net.citizensnpcs.nms.v1_16_R2.entity.GhastController; +import net.citizensnpcs.nms.v1_16_R2.entity.GiantController; +import net.citizensnpcs.nms.v1_16_R2.entity.GuardianController; +import net.citizensnpcs.nms.v1_16_R2.entity.GuardianElderController; +import net.citizensnpcs.nms.v1_16_R2.entity.HoglinController; +import net.citizensnpcs.nms.v1_16_R2.entity.HorseController; +import net.citizensnpcs.nms.v1_16_R2.entity.HorseDonkeyController; +import net.citizensnpcs.nms.v1_16_R2.entity.HorseMuleController; +import net.citizensnpcs.nms.v1_16_R2.entity.HorseSkeletonController; +import net.citizensnpcs.nms.v1_16_R2.entity.HorseZombieController; +import net.citizensnpcs.nms.v1_16_R2.entity.HumanController; +import net.citizensnpcs.nms.v1_16_R2.entity.IllusionerController; +import net.citizensnpcs.nms.v1_16_R2.entity.IronGolemController; +import net.citizensnpcs.nms.v1_16_R2.entity.LlamaController; +import net.citizensnpcs.nms.v1_16_R2.entity.MagmaCubeController; +import net.citizensnpcs.nms.v1_16_R2.entity.MushroomCowController; +import net.citizensnpcs.nms.v1_16_R2.entity.OcelotController; +import net.citizensnpcs.nms.v1_16_R2.entity.PandaController; +import net.citizensnpcs.nms.v1_16_R2.entity.ParrotController; +import net.citizensnpcs.nms.v1_16_R2.entity.PhantomController; +import net.citizensnpcs.nms.v1_16_R2.entity.PigController; +import net.citizensnpcs.nms.v1_16_R2.entity.PigZombieController; +import net.citizensnpcs.nms.v1_16_R2.entity.PiglinBruteController; +import net.citizensnpcs.nms.v1_16_R2.entity.PiglinController; +import net.citizensnpcs.nms.v1_16_R2.entity.PillagerController; +import net.citizensnpcs.nms.v1_16_R2.entity.PolarBearController; +import net.citizensnpcs.nms.v1_16_R2.entity.PufferFishController; +import net.citizensnpcs.nms.v1_16_R2.entity.RabbitController; +import net.citizensnpcs.nms.v1_16_R2.entity.RavagerController; +import net.citizensnpcs.nms.v1_16_R2.entity.SalmonController; +import net.citizensnpcs.nms.v1_16_R2.entity.SheepController; +import net.citizensnpcs.nms.v1_16_R2.entity.ShulkerController; +import net.citizensnpcs.nms.v1_16_R2.entity.SilverfishController; +import net.citizensnpcs.nms.v1_16_R2.entity.SkeletonController; +import net.citizensnpcs.nms.v1_16_R2.entity.SkeletonStrayController; +import net.citizensnpcs.nms.v1_16_R2.entity.SkeletonWitherController; +import net.citizensnpcs.nms.v1_16_R2.entity.SlimeController; +import net.citizensnpcs.nms.v1_16_R2.entity.SnowmanController; +import net.citizensnpcs.nms.v1_16_R2.entity.SpiderController; +import net.citizensnpcs.nms.v1_16_R2.entity.SquidController; +import net.citizensnpcs.nms.v1_16_R2.entity.StriderController; +import net.citizensnpcs.nms.v1_16_R2.entity.TraderLlamaController; +import net.citizensnpcs.nms.v1_16_R2.entity.TropicalFishController; +import net.citizensnpcs.nms.v1_16_R2.entity.TurtleController; +import net.citizensnpcs.nms.v1_16_R2.entity.VexController; +import net.citizensnpcs.nms.v1_16_R2.entity.VillagerController; +import net.citizensnpcs.nms.v1_16_R2.entity.VindicatorController; +import net.citizensnpcs.nms.v1_16_R2.entity.WanderingTraderController; +import net.citizensnpcs.nms.v1_16_R2.entity.WitchController; +import net.citizensnpcs.nms.v1_16_R2.entity.WitherController; +import net.citizensnpcs.nms.v1_16_R2.entity.WolfController; +import net.citizensnpcs.nms.v1_16_R2.entity.ZoglinController; +import net.citizensnpcs.nms.v1_16_R2.entity.ZombieController; +import net.citizensnpcs.nms.v1_16_R2.entity.ZombieHuskController; +import net.citizensnpcs.nms.v1_16_R2.entity.ZombieVillagerController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.AreaEffectCloudController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ArmorStandController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.BoatController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.DragonFireballController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.EggController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.EnderCrystalController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.EnderPearlController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.EnderSignalController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.EvokerFangsController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.FallingBlockController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.FireworkController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.FishingHookController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ItemController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ItemFrameController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.LargeFireballController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.LeashController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.LlamaSpitController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.MinecartChestController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.MinecartCommandController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.MinecartFurnaceController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.MinecartHopperController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.MinecartRideableController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.MinecartTNTController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.PaintingController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ShulkerBulletController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.SmallFireballController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.SnowballController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.SpectralArrowController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.TNTPrimedController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ThrownExpBottleController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ThrownPotionController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.ThrownTridentController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.TippedArrowController; +import net.citizensnpcs.nms.v1_16_R2.entity.nonliving.WitherSkullController; +import net.citizensnpcs.nms.v1_16_R2.network.EmptyChannel; +import net.citizensnpcs.nms.v1_16_R2.trait.Commands; import net.citizensnpcs.npc.EntityControllers; import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator; import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator; @@ -205,74 +205,74 @@ import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMSBridge; import net.citizensnpcs.util.PlayerAnimation; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_16_R3.AdvancementDataPlayer; -import net.minecraft.server.v1_16_R3.AttributeModifiable; -import net.minecraft.server.v1_16_R3.AxisAlignedBB; -import net.minecraft.server.v1_16_R3.BehaviorController; -import net.minecraft.server.v1_16_R3.Block; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.BossBattleServer; -import net.minecraft.server.v1_16_R3.ChunkProviderServer; -import net.minecraft.server.v1_16_R3.ControllerJump; -import net.minecraft.server.v1_16_R3.CrashReport; -import net.minecraft.server.v1_16_R3.CrashReportSystemDetails; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.DataWatcherObject; -import net.minecraft.server.v1_16_R3.EnchantmentManager; -import net.minecraft.server.v1_16_R3.Enchantments; -import net.minecraft.server.v1_16_R3.EnderDragonBattle; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityBird; -import net.minecraft.server.v1_16_R3.EntityCat; -import net.minecraft.server.v1_16_R3.EntityEnderDragon; -import net.minecraft.server.v1_16_R3.EntityEnderman; -import net.minecraft.server.v1_16_R3.EntityFish; -import net.minecraft.server.v1_16_R3.EntityFishSchool; -import net.minecraft.server.v1_16_R3.EntityFishingHook; -import net.minecraft.server.v1_16_R3.EntityHorse; -import net.minecraft.server.v1_16_R3.EntityHorseAbstract; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.EntityLiving; -import net.minecraft.server.v1_16_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_16_R3.EntityPanda; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EntityPose; -import net.minecraft.server.v1_16_R3.EntityPufferFish; -import net.minecraft.server.v1_16_R3.EntityRabbit; -import net.minecraft.server.v1_16_R3.EntityShulker; -import net.minecraft.server.v1_16_R3.EntitySize; -import net.minecraft.server.v1_16_R3.EntityTameableAnimal; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.EntityWither; -import net.minecraft.server.v1_16_R3.EnumMoveType; -import net.minecraft.server.v1_16_R3.Fluid; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IRegistry; -import net.minecraft.server.v1_16_R3.MathHelper; -import net.minecraft.server.v1_16_R3.MinecraftKey; -import net.minecraft.server.v1_16_R3.MobEffects; -import net.minecraft.server.v1_16_R3.NavigationAbstract; -import net.minecraft.server.v1_16_R3.NetworkManager; -import net.minecraft.server.v1_16_R3.Packet; -import net.minecraft.server.v1_16_R3.PacketPlayOutEntityTeleport; -import net.minecraft.server.v1_16_R3.PacketPlayOutPlayerInfo; -import net.minecraft.server.v1_16_R3.PacketPlayOutScoreboardTeam; -import net.minecraft.server.v1_16_R3.PathEntity; -import net.minecraft.server.v1_16_R3.PathPoint; -import net.minecraft.server.v1_16_R3.PathType; -import net.minecraft.server.v1_16_R3.PathfinderGoalSelector; -import net.minecraft.server.v1_16_R3.PlayerChunkMap; -import net.minecraft.server.v1_16_R3.PlayerChunkMap.EntityTracker; -import net.minecraft.server.v1_16_R3.RegistryBlocks; -import net.minecraft.server.v1_16_R3.ReportedException; -import net.minecraft.server.v1_16_R3.ScoreboardTeam; -import net.minecraft.server.v1_16_R3.ScoreboardTeamBase.EnumNameTagVisibility; -import net.minecraft.server.v1_16_R3.SoundEffect; -import net.minecraft.server.v1_16_R3.TagsFluid; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.VoxelShape; -import net.minecraft.server.v1_16_R3.WorldServer; +import net.minecraft.server.v1_16_R2.AdvancementDataPlayer; +import net.minecraft.server.v1_16_R2.AttributeModifiable; +import net.minecraft.server.v1_16_R2.AxisAlignedBB; +import net.minecraft.server.v1_16_R2.BehaviorController; +import net.minecraft.server.v1_16_R2.Block; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.BossBattleServer; +import net.minecraft.server.v1_16_R2.ChunkProviderServer; +import net.minecraft.server.v1_16_R2.ControllerJump; +import net.minecraft.server.v1_16_R2.CrashReport; +import net.minecraft.server.v1_16_R2.CrashReportSystemDetails; +import net.minecraft.server.v1_16_R2.DamageSource; +import net.minecraft.server.v1_16_R2.DataWatcherObject; +import net.minecraft.server.v1_16_R2.EnchantmentManager; +import net.minecraft.server.v1_16_R2.Enchantments; +import net.minecraft.server.v1_16_R2.EnderDragonBattle; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityBird; +import net.minecraft.server.v1_16_R2.EntityCat; +import net.minecraft.server.v1_16_R2.EntityEnderDragon; +import net.minecraft.server.v1_16_R2.EntityEnderman; +import net.minecraft.server.v1_16_R2.EntityFish; +import net.minecraft.server.v1_16_R2.EntityFishSchool; +import net.minecraft.server.v1_16_R2.EntityFishingHook; +import net.minecraft.server.v1_16_R2.EntityHorse; +import net.minecraft.server.v1_16_R2.EntityHorseAbstract; +import net.minecraft.server.v1_16_R2.EntityHuman; +import net.minecraft.server.v1_16_R2.EntityInsentient; +import net.minecraft.server.v1_16_R2.EntityLiving; +import net.minecraft.server.v1_16_R2.EntityMinecartAbstract; +import net.minecraft.server.v1_16_R2.EntityPanda; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.EntityPose; +import net.minecraft.server.v1_16_R2.EntityPufferFish; +import net.minecraft.server.v1_16_R2.EntityRabbit; +import net.minecraft.server.v1_16_R2.EntityShulker; +import net.minecraft.server.v1_16_R2.EntitySize; +import net.minecraft.server.v1_16_R2.EntityTameableAnimal; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.EntityWither; +import net.minecraft.server.v1_16_R2.EnumMoveType; +import net.minecraft.server.v1_16_R2.Fluid; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IRegistry; +import net.minecraft.server.v1_16_R2.MathHelper; +import net.minecraft.server.v1_16_R2.MinecraftKey; +import net.minecraft.server.v1_16_R2.MobEffects; +import net.minecraft.server.v1_16_R2.NavigationAbstract; +import net.minecraft.server.v1_16_R2.NetworkManager; +import net.minecraft.server.v1_16_R2.Packet; +import net.minecraft.server.v1_16_R2.PacketPlayOutEntityTeleport; +import net.minecraft.server.v1_16_R2.PacketPlayOutPlayerInfo; +import net.minecraft.server.v1_16_R2.PacketPlayOutScoreboardTeam; +import net.minecraft.server.v1_16_R2.PathEntity; +import net.minecraft.server.v1_16_R2.PathPoint; +import net.minecraft.server.v1_16_R2.PathType; +import net.minecraft.server.v1_16_R2.PathfinderGoalSelector; +import net.minecraft.server.v1_16_R2.PlayerChunkMap; +import net.minecraft.server.v1_16_R2.PlayerChunkMap.EntityTracker; +import net.minecraft.server.v1_16_R2.RegistryBlocks; +import net.minecraft.server.v1_16_R2.ReportedException; +import net.minecraft.server.v1_16_R2.ScoreboardTeam; +import net.minecraft.server.v1_16_R2.ScoreboardTeamBase.EnumNameTagVisibility; +import net.minecraft.server.v1_16_R2.SoundEffect; +import net.minecraft.server.v1_16_R2.TagsFluid; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.VoxelShape; +import net.minecraft.server.v1_16_R2.WorldServer; @SuppressWarnings("unchecked") public class NMSImpl implements NMSBridge { @@ -575,7 +575,7 @@ public class NMSImpl implements NMSBridge { private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params, final Function function) { - net.minecraft.server.v1_16_R3.Entity raw = getHandle(entity); + net.minecraft.server.v1_16_R2.Entity raw = getHandle(entity); raw.setOnGround(true); // not sure of a better way around this - if onGround is false, then // navigation won't execute, and calling entity.move doesn't diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java similarity index 94% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java index 569fde705..0db6a3ccc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.lang.invoke.MethodHandle; import java.util.EnumMap; @@ -18,13 +18,13 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.ArmorStandTrait; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.PlayerAnimation; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EntityPose; -import net.minecraft.server.v1_16_R3.EnumHand; -import net.minecraft.server.v1_16_R3.Packet; -import net.minecraft.server.v1_16_R3.PacketPlayOutAnimation; -import net.minecraft.server.v1_16_R3.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.EntityPose; +import net.minecraft.server.v1_16_R2.EnumHand; +import net.minecraft.server.v1_16_R2.Packet; +import net.minecraft.server.v1_16_R2.PacketPlayOutAnimation; +import net.minecraft.server.v1_16_R2.PacketPlayOutEntityMetadata; public class PlayerAnimationImpl { public static void play(PlayerAnimation animation, Player bplayer, int radius) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java similarity index 77% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java index a2402193e..829f445ae 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerJump.java @@ -1,6 +1,6 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; public class PlayerControllerJump { private boolean a; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java similarity index 91% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java index c852e9c43..e8b3f2726 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerLook.java @@ -1,10 +1,10 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityLiving; -import net.minecraft.server.v1_16_R3.MathHelper; -import net.minecraft.server.v1_16_R3.Vec3D; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityLiving; +import net.minecraft.server.v1_16_R2.MathHelper; +import net.minecraft.server.v1_16_R2.Vec3D; public class PlayerControllerLook { private final EntityHumanNPC a; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java similarity index 86% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java index 5c0be0684..31a20eee5 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerControllerMove.java @@ -1,17 +1,17 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.util.Random; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_16_R3.AttributeModifiable; -import net.minecraft.server.v1_16_R3.ControllerMove; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.EntityLiving; -import net.minecraft.server.v1_16_R3.EntitySlime; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.MathHelper; +import net.minecraft.server.v1_16_R2.AttributeModifiable; +import net.minecraft.server.v1_16_R2.ControllerMove; +import net.minecraft.server.v1_16_R2.EntityInsentient; +import net.minecraft.server.v1_16_R2.EntityLiving; +import net.minecraft.server.v1_16_R2.EntitySlime; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.MathHelper; public class PlayerControllerMove extends ControllerMove { protected EntityLiving a; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java similarity index 92% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java index 1a0a3ccf4..e066e5105 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerNavigation.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.util.Set; import java.util.stream.Collector; @@ -7,30 +7,30 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableSet; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; -import net.minecraft.server.v1_16_R3.AttributeModifiable; -import net.minecraft.server.v1_16_R3.BaseBlockPosition; -import net.minecraft.server.v1_16_R3.Block; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.Blocks; -import net.minecraft.server.v1_16_R3.ChunkCache; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.EntityTypes; -import net.minecraft.server.v1_16_R3.GenericAttributes; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.MathHelper; -import net.minecraft.server.v1_16_R3.NavigationAbstract; -import net.minecraft.server.v1_16_R3.PathEntity; -import net.minecraft.server.v1_16_R3.PathMode; -import net.minecraft.server.v1_16_R3.PathPoint; -import net.minecraft.server.v1_16_R3.PathType; -import net.minecraft.server.v1_16_R3.Pathfinder; -import net.minecraft.server.v1_16_R3.PathfinderAbstract; -import net.minecraft.server.v1_16_R3.PathfinderNormal; -import net.minecraft.server.v1_16_R3.SystemUtils; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.World; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; +import net.minecraft.server.v1_16_R2.AttributeModifiable; +import net.minecraft.server.v1_16_R2.BaseBlockPosition; +import net.minecraft.server.v1_16_R2.Block; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.Blocks; +import net.minecraft.server.v1_16_R2.ChunkCache; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityInsentient; +import net.minecraft.server.v1_16_R2.EntityTypes; +import net.minecraft.server.v1_16_R2.GenericAttributes; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.MathHelper; +import net.minecraft.server.v1_16_R2.NavigationAbstract; +import net.minecraft.server.v1_16_R2.PathEntity; +import net.minecraft.server.v1_16_R2.PathMode; +import net.minecraft.server.v1_16_R2.PathPoint; +import net.minecraft.server.v1_16_R2.PathType; +import net.minecraft.server.v1_16_R2.Pathfinder; +import net.minecraft.server.v1_16_R2.PathfinderAbstract; +import net.minecraft.server.v1_16_R2.PathfinderNormal; +import net.minecraft.server.v1_16_R2.SystemUtils; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.World; public class PlayerNavigation extends NavigationAbstract { protected final EntityHumanNPC a; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java similarity index 91% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java index c4786cef3..2a9f449e8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinder.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.util.Comparator; import java.util.List; @@ -14,15 +14,15 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import net.citizensnpcs.Settings.Setting; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ChunkCache; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.Path; -import net.minecraft.server.v1_16_R3.PathDestination; -import net.minecraft.server.v1_16_R3.PathEntity; -import net.minecraft.server.v1_16_R3.PathPoint; -import net.minecraft.server.v1_16_R3.Pathfinder; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ChunkCache; +import net.minecraft.server.v1_16_R2.EntityInsentient; +import net.minecraft.server.v1_16_R2.Path; +import net.minecraft.server.v1_16_R2.PathDestination; +import net.minecraft.server.v1_16_R2.PathEntity; +import net.minecraft.server.v1_16_R2.PathPoint; +import net.minecraft.server.v1_16_R2.Pathfinder; public class PlayerPathfinder extends Pathfinder { private final PathPoint[] a = new PathPoint[32]; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java similarity index 82% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java index d34451ff8..76bff0aa3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderAbstract.java @@ -1,14 +1,14 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectMap; import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.ChunkCache; -import net.minecraft.server.v1_16_R3.MathHelper; -import net.minecraft.server.v1_16_R3.PathPoint; -import net.minecraft.server.v1_16_R3.PathfinderAbstract; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.ChunkCache; +import net.minecraft.server.v1_16_R2.MathHelper; +import net.minecraft.server.v1_16_R2.PathPoint; +import net.minecraft.server.v1_16_R2.PathfinderAbstract; public abstract class PlayerPathfinderAbstract extends PathfinderAbstract { protected ChunkCache a; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java similarity index 93% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java index 7dd504ab2..83224e377 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerPathfinderNormal.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.util.EnumSet; @@ -8,33 +8,33 @@ import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2BooleanM import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; import net.citizensnpcs.Settings.Setting; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; -import net.minecraft.server.v1_16_R3.AxisAlignedBB; -import net.minecraft.server.v1_16_R3.Block; -import net.minecraft.server.v1_16_R3.BlockCampfire; -import net.minecraft.server.v1_16_R3.BlockDoor; -import net.minecraft.server.v1_16_R3.BlockFenceGate; -import net.minecraft.server.v1_16_R3.BlockLeaves; -import net.minecraft.server.v1_16_R3.BlockMinecartTrackAbstract; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.Blocks; -import net.minecraft.server.v1_16_R3.ChunkCache; -import net.minecraft.server.v1_16_R3.EntityInsentient; -import net.minecraft.server.v1_16_R3.EnumDirection; -import net.minecraft.server.v1_16_R3.Fluid; -import net.minecraft.server.v1_16_R3.FluidTypes; -import net.minecraft.server.v1_16_R3.IBlockAccess; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.Material; -import net.minecraft.server.v1_16_R3.MathHelper; -import net.minecraft.server.v1_16_R3.PathDestination; -import net.minecraft.server.v1_16_R3.PathMode; -import net.minecraft.server.v1_16_R3.PathPoint; -import net.minecraft.server.v1_16_R3.PathType; -import net.minecraft.server.v1_16_R3.TagsBlock; -import net.minecraft.server.v1_16_R3.TagsFluid; -import net.minecraft.server.v1_16_R3.Vec3D; -import net.minecraft.server.v1_16_R3.VoxelShape; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; +import net.minecraft.server.v1_16_R2.AxisAlignedBB; +import net.minecraft.server.v1_16_R2.Block; +import net.minecraft.server.v1_16_R2.BlockCampfire; +import net.minecraft.server.v1_16_R2.BlockDoor; +import net.minecraft.server.v1_16_R2.BlockFenceGate; +import net.minecraft.server.v1_16_R2.BlockLeaves; +import net.minecraft.server.v1_16_R2.BlockMinecartTrackAbstract; +import net.minecraft.server.v1_16_R2.BlockPosition; +import net.minecraft.server.v1_16_R2.Blocks; +import net.minecraft.server.v1_16_R2.ChunkCache; +import net.minecraft.server.v1_16_R2.EntityInsentient; +import net.minecraft.server.v1_16_R2.EnumDirection; +import net.minecraft.server.v1_16_R2.Fluid; +import net.minecraft.server.v1_16_R2.FluidTypes; +import net.minecraft.server.v1_16_R2.IBlockAccess; +import net.minecraft.server.v1_16_R2.IBlockData; +import net.minecraft.server.v1_16_R2.Material; +import net.minecraft.server.v1_16_R2.MathHelper; +import net.minecraft.server.v1_16_R2.PathDestination; +import net.minecraft.server.v1_16_R2.PathMode; +import net.minecraft.server.v1_16_R2.PathPoint; +import net.minecraft.server.v1_16_R2.PathType; +import net.minecraft.server.v1_16_R2.TagsBlock; +import net.minecraft.server.v1_16_R2.TagsFluid; +import net.minecraft.server.v1_16_R2.Vec3D; +import net.minecraft.server.v1_16_R2.VoxelShape; public class PlayerPathfinderNormal extends PlayerPathfinderAbstract { protected float j; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java similarity index 89% rename from v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java rename to v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java index 71d10075d..18462027f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java +++ b/v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java @@ -1,4 +1,4 @@ -package net.citizensnpcs.nms.v1_16_R3.util; +package net.citizensnpcs.nms.v1_16_R2.util; import java.lang.invoke.MethodHandle; @@ -7,13 +7,13 @@ import org.bukkit.entity.Player; import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.CitizensAPI; -import net.citizensnpcs.nms.v1_16_R3.entity.EntityHumanNPC; +import net.citizensnpcs.nms.v1_16_R2.entity.EntityHumanNPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EntityTrackerEntry; -import net.minecraft.server.v1_16_R3.PlayerChunkMap; -import net.minecraft.server.v1_16_R3.PlayerChunkMap.EntityTracker; +import net.minecraft.server.v1_16_R2.Entity; +import net.minecraft.server.v1_16_R2.EntityPlayer; +import net.minecraft.server.v1_16_R2.EntityTrackerEntry; +import net.minecraft.server.v1_16_R2.PlayerChunkMap; +import net.minecraft.server.v1_16_R2.PlayerChunkMap.EntityTracker; public class PlayerlistTracker extends PlayerChunkMap.EntityTracker { private EntityPlayer lastUpdatedPlayer;