Merge pull request #45 from chrismin13/spigot-1.13

Merge Spigot 1.13 Branch to master

Author: DrkMatr1984

pom.xml

@@ -58,7 +58,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<finalName>AdditionsAPI-for-1.9-1.12</finalName>                   
+					<finalName>AdditionsAPI-for-1.13</finalName>                   
 				</configuration>
 			</plugin> 
 		</plugins>
@@ -93,7 +93,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.12.2-R0.1-SNAPSHOT</version>
+			<version>1.13.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -115,6 +115,14 @@
 			<artifactId>jaxb-api</artifactId>
 			<version>2.3.0</version>
 		</dependency>
+		
+		<!-- This library is included in 1.13, but not in 1.14. -->
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.6</version>
+		</dependency>
 	</dependencies>
 
 </project>

scripts/dev.bat

@@ -6,5 +6,4 @@ rem THE SCRIPT WILL COPY THE MAVEN BUILD INTO THE FOLDER AUTOMAGICALLY
 rem DON'T FORGET TO USE THE 'development' PROFILE!
 echo Apply Script: COPY
 echo %1
-echo F|xcopy /y /s /f /q "%1" "C:\Users\chris\Test Servers\Spigot 1.9\plugins\AdditionsAPI.jar"
-echo F|xcopy /y /s /f /q "%1" "C:\Users\chris\Test Servers\Spigot 1.12.2\plugins\AdditionsAPI.jar"
+echo F|xcopy /y /s /f /q "%1" "C:\Users\chris\Test Servers\Spigot 1.13.1\plugins\AdditionsAPI.jar"

src/main/java/com/chrismin13/additionsapi/AdditionsAPI.java

@@ -63,6 +63,7 @@
 import com.chrismin13.additionsapi.listeners.vanilla.PlayerShearEntity;
 import com.chrismin13.additionsapi.recipes.CustomRecipe;
 import com.chrismin13.additionsapi.utils.Debug;
+import com.chrismin13.additionsapi.utils.MaterialUtils;
 import com.codingforcookies.armorequip.ArmorListener;
 import com.comphenix.attribute.NbtFactory;
 import com.comphenix.attribute.NbtFactory.NbtCompound;
@@ -76,7 +77,6 @@
 public class AdditionsAPI extends JavaPlugin implements Listener {
 
 	private static JavaPlugin instance;
-	private static String mcver = Bukkit.getServer().getVersion();
 
 	public void onEnable() {
 
@@ -158,6 +158,15 @@ this, new ArrowFromCustomBowHit(), new PlayerDeath(), new DurabilityBar(), new F
 		PluginCommand additions = getCommand("additions");
 		additions.setExecutor(new AdditionsCmd());
 		additions.setTabCompleter(new AdditionsTab());
+		
+		// Check if the server has the methods I added to Spigot (anything newer than around the 6th of August 2018 should be good)
+		try {
+			Material.DIAMOND_BLOCK.isInteractable();
+			Material.DIAMOND_BLOCK.getHardness();
+			Material.DIAMOND_BLOCK.getBlastResistance();
+		} catch (NoSuchMethodError e) {
+			MaterialUtils.useNewMethods = false;
+		}
 
 		// Commented out - these are not ready yet. Works on Linux but still fighting
 		// for the rest of the OSes.
@@ -276,17 +285,12 @@ public void onInitialization(AdditionsAPIInitializationEvent event) {
 				ItemStack item = cStack.getItemStack();
 				cStacks.add(cStack);
 				if (cItemConfig.canBeCreated()) {
-					if (mcver.contains("1.9") || mcver.contains("1.10") || mcver.contains("1.11")) {
-						for (CustomRecipe cRecipe : cItem.getCustomRecipes())
-							cRecipe.registerBukkitRecipe(item);
-					} else {
-						String[] idPart = idName.split(":");
-						int i = 1;
-						for (CustomRecipe cRecipe : cItem.getCustomRecipes()) {
-							NamespacedKey key = new NamespacedKey(idPart[0], idPart[1] + "_" + i);
-							cRecipe.registerBukkitRecipe(key, item);
-							i++;
-						}
+					String[] idPart = idName.split(":");
+					int i = 1;
+					for (CustomRecipe cRecipe : cItem.getCustomRecipes()) {
+						NamespacedKey key = new NamespacedKey(idPart[0], idPart[1] + "_" + i);
+						cRecipe.registerBukkitRecipe(key, item);
+						i++;
 					}
 				}
 			}
@@ -345,6 +349,7 @@ public static void clearAll() {
 	public static String getIdName(ItemStack item) {
 		if (item == null || item.getType().equals(Material.AIR))
 			return null;
+
 		ItemStack stack = NbtFactory.getCraftItemStack(item.clone());
 		NbtCompound nbt = NbtFactory.fromItemTag(stack);
 		return nbt.getString("CustomItem.IdName", null);

src/main/java/com/chrismin13/additionsapi/durability/ShearDurability.java

@@ -21,10 +21,28 @@ public class ShearDurability extends ItemDurability {
 
 	public ShearDurability() {
 		super.setInstantBlockBreak(1);
-		super.addSpecialBlock(Material.WEB, 1);
-		super.addSpecialBlock(Material.LEAVES, 1);
-		super.addSpecialBlock(Material.LEAVES_2, 1);
-		super.addSpecialBlock(Material.WOOL, 1);
+		super.addSpecialBlock(Material.COBWEB, 1);
+		super.addSpecialBlock(Material.ACACIA_LEAVES, 1);
+		super.addSpecialBlock(Material.BIRCH_LEAVES, 1);
+		super.addSpecialBlock(Material.JUNGLE_LEAVES, 1);
+		super.addSpecialBlock(Material.OAK_LEAVES, 1);
+		super.addSpecialBlock(Material.SPRUCE_LEAVES, 1);
+		super.addSpecialBlock(Material.BLACK_WOOL, 1);
+		super.addSpecialBlock(Material.BLUE_WOOL, 1);
+		super.addSpecialBlock(Material.BROWN_WOOL, 1);
+		super.addSpecialBlock(Material.CYAN_WOOL, 1);
+		super.addSpecialBlock(Material.GRAY_WOOL, 1);
+		super.addSpecialBlock(Material.GREEN_WOOL, 1);
+		super.addSpecialBlock(Material.LIME_WOOL, 1);
+		super.addSpecialBlock(Material.MAGENTA_WOOL, 1);
+		super.addSpecialBlock(Material.ORANGE_WOOL, 1);
+		super.addSpecialBlock(Material.PINK_WOOL, 1);
+		super.addSpecialBlock(Material.PURPLE_WOOL, 1);
+		super.addSpecialBlock(Material.RED_WOOL, 1);
+		super.addSpecialBlock(Material.WHITE_WOOL, 1);
+		super.addSpecialBlock(Material.YELLOW_WOOL, 1);
+		super.addSpecialBlock(Material.LIGHT_BLUE_WOOL, 1);
+		super.addSpecialBlock(Material.LIGHT_GRAY_WOOL, 1);
 		super.addSpecialBlock(Material.VINE, 1);
 	}
 

src/main/java/com/chrismin13/additionsapi/enums/ArmorType.java

@@ -64,13 +64,13 @@ public Material getChainmailMaterial() {
 	public Material getGoldMaterial() {
 		switch (this) {
 		case HELMET:
-			return Material.GOLD_HELMET;
+			return Material.GOLDEN_HELMET;
 		case CHESTPLATE:
-			return Material.GOLD_CHESTPLATE;
+			return Material.GOLDEN_CHESTPLATE;
 		case LEGGINGS:
-			return Material.GOLD_LEGGINGS;
+			return Material.GOLDEN_LEGGINGS;
 		case BOOTS:
-			return Material.GOLD_BOOTS;
+			return Material.GOLDEN_BOOTS;
 		default:
 			return null;
 		}
@@ -162,25 +162,25 @@ public static ArmorType getArmorType(ItemStack item) {
 	public static ArmorType getArmorType(Material material) {
 		switch (material) {
 		case DIAMOND_HELMET:
-		case GOLD_HELMET:
+		case GOLDEN_HELMET:
 		case IRON_HELMET:
 		case CHAINMAIL_HELMET:
 		case LEATHER_HELMET:
 			return HELMET;
 		case DIAMOND_CHESTPLATE:
-		case GOLD_CHESTPLATE:
+		case GOLDEN_CHESTPLATE:
 		case IRON_CHESTPLATE:
 		case CHAINMAIL_CHESTPLATE:
 		case LEATHER_CHESTPLATE:
 			return CHESTPLATE;
 		case DIAMOND_LEGGINGS:
-		case GOLD_LEGGINGS:
+		case GOLDEN_LEGGINGS:
 		case IRON_LEGGINGS:
 		case CHAINMAIL_LEGGINGS:
 		case LEATHER_LEGGINGS:
 			return LEGGINGS;
 		case DIAMOND_BOOTS:
-		case GOLD_BOOTS:
+		case GOLDEN_BOOTS:
 		case IRON_BOOTS:
 		case CHAINMAIL_BOOTS:
 		case LEATHER_BOOTS: