Merge pull request #8 from SourceWriters/feat/BoundingBoxes

Feat/bounding boxes

.gitignore

@@ -8,4 +8,4 @@
 /.project
 /.gitlab-ci.yml
 /test/
-/libraries/spigot/
+/libraries/spigot/

README.md

@@ -23,7 +23,7 @@
 [![Contributors][contributors-shield]][contributors-url]
 [![Stargazers][stars-shield]][stars-url]
 [![Issues][issues-shield]][issues-url]
-[![MIT License][license-shield]][license-url]
+[![GPL-3.0 License][license-shield]][license-url]
 
 
 
@@ -103,7 +103,7 @@ Please notice that you need to authenticate with GitHub Packages ([Maven](https:
   <depedency>
     <groupId>net.sourcewriters.minecraft</groupId>
     <artifactId>vcompat</artifactId>
-    <version>1.0</version>
+    <version>1.1.0</version>
   <dependency>
 <depedencies>
 ```
@@ -116,7 +116,7 @@ plugins {
 }
 
 dependencies {
-  implementation group: 'net.sourcewriters.minecraft', name: 'vcompat', version: '1.0'
+  implementation group: 'net.sourcewriters.minecraft', name: 'vcompat', version: '1.1.0'
 }
 ```
 

pom.xml

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>net.sourcewriters.minecraft</groupId>
-	<artifactId>vcompat</artifactId>
-	<version>1.0</version>
+	<artifactId>versiontools</artifactId>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 	<name>vCompat</name>
 

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/ToolProvider.java

@@ -1,5 +1,6 @@
 package net.sourcewriters.minecraft.versiontools.reflection;
 
+import net.sourcewriters.minecraft.versiontools.reflection.tools.BlockTools;
 import net.sourcewriters.minecraft.versiontools.reflection.tools.ServerTools;
 import net.sourcewriters.minecraft.versiontools.reflection.tools.SkinTools;
 
@@ -12,5 +13,7 @@ protected ToolProvider(V versionControl) {
 	public abstract SkinTools getSkinTools();
 
 	public abstract ServerTools getServerTools();
+
+	public abstract BlockTools getBlockTools();
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/entity/NmsEntity.java

@@ -5,6 +5,8 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
+
 public interface NmsEntity {
 
 	Object getHandle();
@@ -52,5 +54,7 @@ public interface NmsEntity {
 	Player[] getVisibleAsPlayer();
 
 	void kill();
+
+	NmsBoundingBox getBoundingBox();
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_10_R1/ToolProvider1_10_R1.java

@@ -5,6 +5,7 @@
 
 public class ToolProvider1_10_R1 extends ToolProvider<VersionControl1_10_R1> {
 
+	private final BlockTools1_10_R1 blockTools = new BlockTools1_10_R1();
 	private final SkinTools1_10_R1 skinTools = new SkinTools1_10_R1();
 	private final ServerTools1_10_R1 serverTools = new ServerTools1_10_R1();
 
@@ -22,4 +23,9 @@ public ServerTools1_10_R1 getServerTools() {
 		return serverTools;
 	}
 
+	@Override
+	public BlockTools1_10_R1 getBlockTools() {
+		return blockTools;
+	}
+
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_10_R1/entity/Entity1_10_R1.java

@@ -19,7 +19,9 @@
 import net.minecraft.server.v1_10_R1.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_10_R1.PlayerConnection;
 import net.minecraft.server.v1_10_R1.Vec3D;
+import net.minecraft.server.v1_10_R1.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_10_R1<E extends Entity> implements NmsEntity {
 
@@ -46,6 +48,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.a, box.b, box.c, box.d, box.e, box.f);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(name);

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_11_R1/ToolProvider1_11_R1.java

@@ -5,6 +5,7 @@
 
 public class ToolProvider1_11_R1 extends ToolProvider<VersionControl1_11_R1> {
 
+	private final BlockTools1_11_R1 blockTools = new BlockTools1_11_R1();
 	private final SkinTools1_11_R1 skinTools = new SkinTools1_11_R1();
 	private final ServerTools1_11_R1 serverTools = new ServerTools1_11_R1();
 
@@ -21,5 +22,10 @@ public SkinTools1_11_R1 getSkinTools() {
 	public ServerTools1_11_R1 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_11_R1 getBlockTools() {
+		return blockTools;
+	}
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_11_R1/entity/Entity1_11_R1.java

@@ -19,7 +19,9 @@
 import net.minecraft.server.v1_11_R1.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_11_R1.PlayerConnection;
 import net.minecraft.server.v1_11_R1.Vec3D;
+import net.minecraft.server.v1_11_R1.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_11_R1<E extends Entity> implements NmsEntity {
 
@@ -46,6 +48,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.a, box.b, box.c, box.d, box.e, box.f);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(name);

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_12_R1/ToolProvider1_12_R1.java

@@ -4,7 +4,8 @@
 import net.sourcewriters.minecraft.versiontools.reflection.provider.v1_12_R1.tools.*;
 
 public class ToolProvider1_12_R1 extends ToolProvider<VersionControl1_12_R1> {
-
+
+	private final BlockTools1_12_R1 blockTools = new BlockTools1_12_R1();
 	private final SkinTools1_12_R1 skinTools = new SkinTools1_12_R1();
 	private final ServerTools1_12_R1 serverTools = new ServerTools1_12_R1();
 
@@ -21,5 +22,10 @@ public SkinTools1_12_R1 getSkinTools() {
 	public ServerTools1_12_R1 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_12_R1 getBlockTools() {
+		return blockTools;
+	}
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_12_R1/entity/Entity1_12_R1.java

@@ -19,7 +19,9 @@
 import net.minecraft.server.v1_12_R1.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_12_R1.PlayerConnection;
 import net.minecraft.server.v1_12_R1.Vec3D;
+import net.minecraft.server.v1_12_R1.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_12_R1<E extends Entity> implements NmsEntity {
 
@@ -46,6 +48,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.a, box.b, box.c, box.d, box.e, box.f);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(name);

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_13_R1/ToolProvider1_13_R1.java

@@ -4,7 +4,8 @@
 import net.sourcewriters.minecraft.versiontools.reflection.provider.v1_13_R1.tools.*;
 
 public class ToolProvider1_13_R1 extends ToolProvider<VersionControl1_13_R1> {
-
+
+	private final BlockTools1_13_R1 blockTools = new BlockTools1_13_R1();
 	private final SkinTools1_13_R1 skinTools = new SkinTools1_13_R1();
 	private final ServerTools1_13_R1 serverTools = new ServerTools1_13_R1();
 
@@ -21,5 +22,10 @@ public SkinTools1_13_R1 getSkinTools() {
 	public ServerTools1_13_R1 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_13_R1 getBlockTools() {
+		return blockTools;
+	}
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_13_R1/entity/Entity1_13_R1.java

@@ -20,7 +20,9 @@
 import net.minecraft.server.v1_13_R1.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_13_R1.PlayerConnection;
 import net.minecraft.server.v1_13_R1.Vec3D;
+import net.minecraft.server.v1_13_R1.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_13_R1<E extends Entity> implements NmsEntity {
 
@@ -47,6 +49,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.a, box.b, box.c, box.d, box.e, box.f);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(CraftChatMessage.fromStringOrNull(name));

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_13_R2/ToolProvider1_13_R2.java

@@ -5,6 +5,7 @@
 
 public class ToolProvider1_13_R2 extends ToolProvider<VersionControl1_13_R2> {
 
+	private final BlockTools1_13_R2 blockTools = new BlockTools1_13_R2();
 	private final SkinTools1_13_R2 skinTools = new SkinTools1_13_R2();
 	private final ServerTools1_13_R2 serverTools = new ServerTools1_13_R2();
 
@@ -21,5 +22,10 @@ public SkinTools1_13_R2 getSkinTools() {
 	public ServerTools1_13_R2 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_13_R2 getBlockTools() {
+		return blockTools;
+	}
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_13_R2/entity/Entity1_13_R2.java

@@ -20,7 +20,9 @@
 import net.minecraft.server.v1_13_R2.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_13_R2.PlayerConnection;
 import net.minecraft.server.v1_13_R2.Vec3D;
+import net.minecraft.server.v1_13_R2.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_13_R2<E extends Entity> implements NmsEntity {
 
@@ -47,6 +49,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(CraftChatMessage.fromStringOrNull(name));

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_14_R1/ToolProvider1_14_R1.java

@@ -5,6 +5,7 @@
 
 public class ToolProvider1_14_R1 extends ToolProvider<VersionControl1_14_R1> {
 
+	private final BlockTools1_14_R1 blockTools = new BlockTools1_14_R1();
 	private final SkinTools1_14_R1 skinTools = new SkinTools1_14_R1();
 	private final ServerTools1_14_R1 serverTools = new ServerTools1_14_R1();
 
@@ -21,5 +22,10 @@ public SkinTools1_14_R1 getSkinTools() {
 	public ServerTools1_14_R1 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_14_R1 getBlockTools() {
+		return blockTools;
+	}
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_14_R1/entity/Entity1_14_R1.java

@@ -19,7 +19,9 @@
 import net.minecraft.server.v1_14_R1.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_14_R1.PlayerConnection;
 import net.minecraft.server.v1_14_R1.Vec3D;
+import net.minecraft.server.v1_14_R1.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_14_R1<E extends Entity> implements NmsEntity {
 
@@ -46,6 +48,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(CraftChatMessage.fromStringOrNull(name));

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_15_R1/ToolProvider1_15_R1.java

@@ -5,6 +5,7 @@
 
 public class ToolProvider1_15_R1 extends ToolProvider<VersionControl1_15_R1> {
 
+	private final BlockTools1_15_R1 blockTools = new BlockTools1_15_R1();
 	private final SkinTools1_15_R1 skinTools = new SkinTools1_15_R1();
 	private final ServerTools1_15_R1 serverTools = new ServerTools1_15_R1();
 
@@ -21,5 +22,10 @@ public SkinTools1_15_R1 getSkinTools() {
 	public ServerTools1_15_R1 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_15_R1 getBlockTools() {
+		return blockTools;
+	}
 
 }

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_15_R1/entity/Entity1_15_R1.java

@@ -19,7 +19,9 @@
 import net.minecraft.server.v1_15_R1.PacketPlayOutSpawnEntity;
 import net.minecraft.server.v1_15_R1.PlayerConnection;
 import net.minecraft.server.v1_15_R1.Vec3D;
+import net.minecraft.server.v1_15_R1.AxisAlignedBB;
 import net.sourcewriters.minecraft.versiontools.reflection.entity.NmsEntity;
+import net.sourcewriters.minecraft.versiontools.reflection.utils.NmsBoundingBox;
 
 public abstract class Entity1_15_R1<E extends Entity> implements NmsEntity {
 
@@ -46,6 +48,12 @@ public UUID getUniqueId() {
 		return handle.getUniqueID();
 	}
 
+	@Override
+	public NmsBoundingBox getBoundingBox() {
+		AxisAlignedBB box = handle.getBoundingBox();
+		return new NmsBoundingBox(box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ);
+	}
+
 	@Override
 	public void setCustomName(String name) {
 		handle.setCustomName(CraftChatMessage.fromStringOrNull(name));

src/main/java/net/sourcewriters/minecraft/versiontools/reflection/provider/v1_16_R1/ToolProvider1_16_R1.java

@@ -5,6 +5,7 @@
 
 public class ToolProvider1_16_R1 extends ToolProvider<VersionControl1_16_R1> {
 
+	private final BlockTools1_16_R1 blockTools = new BlockTools1_16_R1();
 	private final SkinTools1_16_R1 skinTools = new SkinTools1_16_R1();
 	private final ServerTools1_16_R1 serverTools = new ServerTools1_16_R1();
 
@@ -21,5 +22,10 @@ public SkinTools1_16_R1 getSkinTools() {
 	public ServerTools1_16_R1 getServerTools() {
 		return serverTools;
 	}
+
+	@Override
+	public BlockTools1_16_R1 getBlockTools() {
+		return blockTools;
+	}
 
 }