v4.0.0-alpha

* support MC 1.14 and 1.15 * remove usage of deprecated Spigot API
NiklasEi · Feb 20, 2020 · fe92afc · fe92afc
1 parent 2d3f70d
commit fe92afc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.nikl.gamebox.games</groupId>
     <artifactId>GemCrush</artifactId>
-    <version>3.0.1</version>
+    <version>4.0.0-alpha</version>
 
     <repositories>
         <repository>
@@ -24,14 +24,14 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.14.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- GameBox -->
         <dependency>
             <groupId>me.nikl</groupId>
-            <artifactId>gamebox</artifactId>
-            <version>2.0.0</version>
+            <artifactId>gamebox-core</artifactId>
+            <version>3.0.0-alpha</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/me/nikl/gamebox/games/gemcrush/gems/Gem.java b/src/main/java/me/nikl/gamebox/games/gemcrush/gems/Gem.java
@@ -3,6 +3,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
@@ -23,28 +24,29 @@ public abstract class Gem {
         this.item = new ItemStack(material, 1);
         ItemMeta meta = item.getItemMeta();
         meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name));
-        if (lore != null && lore.size() > 0) {
-            meta.setLore(lore);
-        }
         item.setItemMeta(meta);
         this.name = name;
         this.pointsOnBreak = 10;
     }
 
     Gem(Material material, String name, short durability) {
         this(material, name);
-        item.setDurability(durability);
+        ItemMeta meta = item.getItemMeta();
+        if (meta instanceof Damageable) {
+            ((Damageable) meta).setDamage(durability);
+            item.setItemMeta(meta);
+        }
         this.name = name;
         this.pointsOnBreak = 10;
     }
 
     Gem(Material material, String name, short durability, List<String> lore) {
         this(material, name, durability);
         if (lore != null && !lore.isEmpty())
-            this.setLore(new ArrayList(lore));
+            this.setLore(new ArrayList<>(lore));
     }
 
-    public void setLore(ArrayList lore) {
+    public void setLore(List<String> lore) {
         ItemMeta meta = item.getItemMeta();
         meta.setLore(lore);
         item.setItemMeta(meta);

diff --git a/src/main/java/me/nikl/gamebox/games/gemcrush/gems/NormalGem.java b/src/main/java/me/nikl/gamebox/games/gemcrush/gems/NormalGem.java
@@ -1,6 +1,8 @@
 package me.nikl.gamebox.games.gemcrush.gems;
 
 import org.bukkit.Material;
+import org.bukkit.inventory.meta.Damageable;
+import org.bukkit.inventory.meta.ItemMeta;
 
 /**
  * @author Niklas Eicker
@@ -19,7 +21,14 @@ public NormalGem(Material material, String name, short dur) {
     }
 
     public NormalGem(NormalGem copyFrom) {
-        super(copyFrom.getItem().getType(), copyFrom.name, copyFrom.getItem().getDurability(), copyFrom.lore);
+        super(copyFrom.getItem().getType(), copyFrom.name);
+        ItemMeta meta = item.getItemMeta();
+        ItemMeta oldMeta = copyFrom.getItem().getItemMeta();
+        if (meta instanceof Damageable && oldMeta instanceof Damageable) {
+            ((Damageable) meta).setDamage(((Damageable) oldMeta).getDamage());
+        }
+        meta.setLore(oldMeta.getLore());
+        item.setItemMeta(meta);
         this.possibility = copyFrom.possibility;
         this.pointsOnBreak = copyFrom.pointsOnBreak;
     }

diff --git a/src/main/resources/games/gemcrush/config.yml b/src/main/resources/games/gemcrush/config.yml
@@ -144,7 +144,7 @@ onGameEnd:
 
 
 
-# use 'Material:data' or 'ID:data'
+# use 'Material' see e.g. https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/browse/src/main/java/org/bukkit/Material.java
 # Some materials can not be displayed in an inventory, just test everything after changing
 # You are advised to use different materials.
 # The display names have to be different for the game to work!
@@ -165,13 +165,9 @@ normalGems:
   gem2:
     material: 'EMERALD'
     displayName: '&2Emerald'
-    pointsOnBreak: 10
-    probability: 1
   gem3:
     material: 'BLAZE_POWDER'
     displayName: '&eSparks'
-    pointsOnBreak: 10
-    probability: 1
   gem4:
     material: 'clay_ball'
     displayName: '&7Pearl'
@@ -194,6 +190,6 @@ normalGems:
     material: 'structure_void'
     displayName: '&2Wheel'
   gem11:
-    material: 'double_plant'
+    material: 'SUNFLOWER'
     displayName: '&6Amber'
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,7 @@
 name: GemCrush
 author: Nikl
 main: me.nikl.gamebox.games.GemCrushMain
-version: 3.0.1
+version: 4.0.0-alpha
+api-version: 1.14
 website: nikl.me
 depend: [GameBox]