feat(dependencies): upgraded to 1.15

Slaymd · Mar 16, 2020 · 80ee9c4 · 80ee9c4
1 parent 515d286
commit 80ee9c4
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 10 deletions.
diff --git a/.idea/libraries/Spigot_API_1_14_4.xml b/.idea/libraries/Spigot_API_1_14_4.xml
diff --git a/.idea/libraries/spigot_1_15_2.xml b/.idea/libraries/spigot_1_15_2.xml
diff --git a/CaulCrafting.iml b/CaulCrafting.iml
@@ -7,6 +7,8 @@
     <libelement value="jar://$MODULE_DIR$/lib/spigot-1.9-R0.1-SNAPSHOT-latest.jar!/" />
     <libelement value="jar://$MODULE_DIR$/lib/spigot-1.9.4-R0.1-SNAPSHOT-latest.jar!/" />
     <libelement value="jar://$MODULE_DIR$/lib/spigot-1.13.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/Spigot-1.14.4.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/spigot-1.15.2.jar!/" />
     <src_description expected_position="0">
       <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
     </src_description>
@@ -86,5 +88,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/spigot-1.15.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/lib/spigot-1.15.2.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="spigot-1.15.2" level="project" />
   </component>
 </module>
diff --git a/lib/spigot-1.15.2.jar b/lib/spigot-1.15.2.jar
diff --git a/plugin.yml b/plugin.yml
@@ -1,5 +1,5 @@
 main: fr.dariusmtn.caulcrafting.CaulCrafting
-version: 6.0.1
+version: 6.0.2
 name: CaulCrafting
 author: Slaymd
 commands:

diff --git a/src/fr/dariusmtn/caulcrafting/CaulCrafting.java b/src/fr/dariusmtn/caulcrafting/CaulCrafting.java
@@ -113,6 +113,9 @@ private boolean setupItemsname(){
 
 		//Getting itemsname class specific version
 		switch (version) {
+		case "v1_15_R1":
+			itemsname = new Itemsname_1_15_R1();
+			break;
 		case "v1_14_R1":
 			itemsname = new Itemsname_1_14_R1();
 			break;

diff --git a/src/fr/dariusmtn/caulcrafting/itemsname/Itemsname_1_15_R1.java b/src/fr/dariusmtn/caulcrafting/itemsname/Itemsname_1_15_R1.java
@@ -0,0 +1,26 @@
+package fr.dariusmtn.caulcrafting.itemsname;
+
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
+import org.bukkit.inventory.ItemStack;
+
+public class Itemsname_1_15_R1 implements Itemsname{
+
+    @Override
+    public String getItemStackName(ItemStack stack){
+
+        String name = "";
+        int amt = stack.getAmount();
+
+        try {
+            name =  CraftItemStack.asNMSCopy(stack).getName().getString();
+        } catch (Exception e) {
+            name = stack.getType().toString();
+        }
+
+        if(amt > 1)
+            name += " §3x " + amt;
+
+        return name;
+    }
+
+}