Update for 1.13 and 1.14 compatibility

elBukkit · Jul 22, 2019 · 0cb626b · 0cb626b
1 parent 26a43d3
commit 0cb626b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 
+# 2.0
+
+ - 1.14 and 1.13 compatibility
+
 # 1.8
 
  - Race compatibility

diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>com.elmakers.mine.bukkit</groupId>
 			<artifactId>CompatibilityLib</artifactId>
-			<version>1.9-1.12.1-2-SNAPSHOT</version>
+			<version>1.9-1.14-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/com/elmakers/mine/bukkit/heroes/HotbarController.java b/src/main/java/com/elmakers/mine/bukkit/heroes/HotbarController.java
@@ -25,9 +25,10 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -58,6 +59,7 @@ public class HotbarController {
     private int skillInventoryRows;
     private MaterialAndData defaultSkillIcon;
     private String defaultDisabledIconURL;
+    private MaterialAndData skullMaterial;
 
     private Map<UUID, SkillSelector> selectors = new HashMap<>();
 
@@ -140,7 +142,17 @@ public ItemStack createSkillItem(SkillDescription skill, Player player) {
         }
 
         if (iconURL != null && !iconURL.isEmpty()) {
-            item = InventoryUtils.getURLSkull(iconURL);
+            try {
+                MaterialAndData skullMaterial = getSkullMaterial();
+                if (skullMaterial == null) {
+                    getLogger().warning("Unable to find a skull material to use for icons");
+                } else {
+                    item = new ItemStack(skullMaterial.getMaterial(), 1, skullMaterial.getData());
+                    InventoryUtils.setSkullURLAndName(item, new URL(iconURL), "MHF_Question", UUID.randomUUID());
+                }
+            } catch (MalformedURLException e) {
+                getLogger().warning("Invalid URL: " + iconURL);
+            }
         } else {
             item = icon.createItemStack();
         }
@@ -174,6 +186,23 @@ public ItemStack createSkillItem(SkillDescription skill, Player player) {
         return item;
     }
 
+    protected MaterialAndData getSkullMaterial() {
+        if (skullMaterial == null) {
+            try {
+                skullMaterial = new MaterialAndData(Material.SKULL_ITEM, (short)3);
+                getLogger().info("Using legacy skull item");
+            } catch (Exception not14) {
+                try {
+                    skullMaterial = new MaterialAndData(Material.valueOf("PLAYER_HEAD"), (short)0);
+                    getLogger().info("Using modern skull item");
+                } catch (Exception ex) {
+
+                }
+            }
+        }
+        return skullMaterial;
+    }
+
     protected Skill getSkill(String key) {
         if (skills == null) return null;
         return skills.getSkill(key);