Revert "Rename to 1_16_R2"

This reverts commit 4542d70.
CitizensDev · Nov 3, 2020 · 95dcaf3 · 95dcaf3
1 parent 4542d70
commit 95dcaf3
Show file tree

Hide file tree

Showing 131 changed files with 2,166 additions and 2,166 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -82,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_16_R2</artifactId>
+            <artifactId>citizens-v1_16_R3</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 		<module>v1_13_R2</module>
         <module>v1_14_R1</module>
         <module>v1_15_R1</module>
-        <module>v1_16_R2</module>
+        <module>v1_16_R3</module>
 		<module>dist</module>
 	</modules>
 </project>
diff --git a/v1_16_R2/pom.xml → v1_16_R3/pom.xml b/v1_16_R2/pom.xml → v1_16_R3/pom.xml
@@ -8,7 +8,7 @@
 		<artifactId>citizens-parent</artifactId>
 		<version>2.0.27-SNAPSHOT</version>
 	</parent>
-	<artifactId>citizens-v1_16_R2</artifactId>
+	<artifactId>citizens-v1_16_R3</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/...cs/nms/v1_16_R3/entity/BatController.java → ...cs/nms/v1_16_R3/entity/BatController.java b/...cs/nms/v1_16_R3/entity/BatController.java → ...cs/nms/v1_16_R3/entity/BatController.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_16_R2.entity;
+package net.citizensnpcs.nms.v1_16_R3.entity;
 
 import org.bukkit.Bukkit;
-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 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 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_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-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;
+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;
 
 public class BatController extends MobEntityController {
     public BatController() {
@@ -72,7 +72,7 @@ public void checkDespawn() {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
+        public void collide(net.minecraft.server.v1_16_R3.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/...cs/nms/v1_16_R3/entity/BeeController.java → ...cs/nms/v1_16_R3/entity/BeeController.java b/...cs/nms/v1_16_R3/entity/BeeController.java → ...cs/nms/v1_16_R3/entity/BeeController.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_16_R2.entity;
+package net.citizensnpcs.nms.v1_16_R3.entity;
 
 import org.bukkit.Bukkit;
-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 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 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_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-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;
+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;
 
 public class BeeController extends MobEntityController {
     public BeeController() {
@@ -71,7 +71,7 @@ public void checkDespawn() {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
+        public void collide(net.minecraft.server.v1_16_R3.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/.../nms/v1_16_R3/entity/BlazeController.java → .../nms/v1_16_R3/entity/BlazeController.java b/.../nms/v1_16_R3/entity/BlazeController.java → .../nms/v1_16_R3/entity/BlazeController.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_16_R2.entity;
+package net.citizensnpcs.nms.v1_16_R3.entity;
 
 import org.bukkit.Bukkit;
-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 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 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_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-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;
+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;
 
 public class BlazeController extends MobEntityController {
     public BlazeController() {
@@ -71,7 +71,7 @@ public void checkDespawn() {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
+        public void collide(net.minecraft.server.v1_16_R3.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/...cs/nms/v1_16_R3/entity/CatController.java → ...cs/nms/v1_16_R3/entity/CatController.java b/...cs/nms/v1_16_R3/entity/CatController.java → ...cs/nms/v1_16_R3/entity/CatController.java
@@ -1,32 +1,32 @@
-package net.citizensnpcs.nms.v1_16_R2.entity;
+package net.citizensnpcs.nms.v1_16_R3.entity;
 
 import org.bukkit.Bukkit;
-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 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 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_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-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;
+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;
 
 public class CatController extends MobEntityController {
     public CatController() {
@@ -101,7 +101,7 @@ public void checkDespawn() {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
+        public void collide(net.minecraft.server.v1_16_R3.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/entity/CaveSpiderController.java → ...v1_16_R3/entity/CaveSpiderController.java b/...v1_16_R3/entity/CaveSpiderController.java → ...v1_16_R3/entity/CaveSpiderController.java
@@ -1,31 +1,31 @@
-package net.citizensnpcs.nms.v1_16_R2.entity;
+package net.citizensnpcs.nms.v1_16_R3.entity;
 
 import org.bukkit.Bukkit;
-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 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 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_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-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;
+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;
 
 public class CaveSpiderController extends MobEntityController {
     public CaveSpiderController() {
@@ -89,7 +89,7 @@ public void checkDespawn() {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
+        public void collide(net.minecraft.server.v1_16_R3.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/...ms/v1_16_R3/entity/ChickenController.java → ...ms/v1_16_R3/entity/ChickenController.java b/...ms/v1_16_R3/entity/ChickenController.java → ...ms/v1_16_R3/entity/ChickenController.java
@@ -1,32 +1,32 @@
-package net.citizensnpcs.nms.v1_16_R2.entity;
+package net.citizensnpcs.nms.v1_16_R3.entity;
 
 import org.bukkit.Bukkit;
-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 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 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_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_16_R3.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-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;
+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;
 
 public class ChickenController extends MobEntityController {
     public ChickenController() {
@@ -102,7 +102,7 @@ public void checkDespawn() {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
+        public void collide(net.minecraft.server.v1_16_R3.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);