fix dependency versioning/fix ench short tags

ds58 · Mar 17, 2019 · 367b047 · 367b047
1 parent 2b6f0c5
commit 367b047
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanDestroy.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanDestroy.java
@@ -8,12 +8,12 @@
 public class NbtCheck_CanDestroy extends NbtCheck {
 
 	public NbtCheck_CanDestroy() {
-		super("CanDestroy", PStrictness.AVERAGE);
+		super("CanDestroy", PStrictness.STRICT);
 	}
 
 	@Override
 	public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolConstants protocolConstants, PConfig config) {
-		return true;
+		return false;
 	}
 
 }
diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanPlaceOn.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_CanPlaceOn.java
@@ -8,12 +8,12 @@
 public class NbtCheck_CanPlaceOn extends NbtCheck {
 
 	public NbtCheck_CanPlaceOn() {
-		super("CanPlaceOn", PStrictness.AVERAGE);
+		super("CanPlaceOn", PStrictness.STRICT);
 	}
 
 	@Override
 	public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolConstants protocolConstants, PConfig config) {
-		return true;
+		return false;
 	}
 
 }
diff --git a/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java b/api/src/main/java/com/ruinscraft/panilla/api/nbt/checks/NbtCheck_ench.java
@@ -37,7 +37,9 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
 			INbtTagCompound enchantment = enchantments.get(i);
 			Enchantment bukkitEnchantment = getEnchantment(enchantment);
 
-			if (bukkitEnchantment == null) return true;
+			if (bukkitEnchantment == null) {
+				continue;
+			}
 
 			int lvl = 0xFFFF & enchantments.get(i).getShort("lvl");
 
@@ -64,7 +66,7 @@ public boolean check(INbtTagCompound tag, String nmsItemClassName, IProtocolCons
 	}
 
 	private static Enchantment getEnchantment(INbtTagCompound enchantment) {
-		if (enchantment.hasKeyOfType("id", NbtDataType.INT)) {
+		if (enchantment.hasKeyOfType("id", NbtDataType.INT) || enchantment.hasKeyOfType("id", NbtDataType.SHORT)) {
 			final int id = enchantment.getInt("id");
 
 			try {

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -27,19 +27,19 @@
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-v1_12_R1</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-v1_13_R2</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.ruinscraft</groupId>
 			<artifactId>panilla-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>