1.15 support

poma123 · Dec 15, 2019 · 9bf8b60 · 9bf8b60
1 parent 6494e21
commit 9bf8b60
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 108 deletions.
diff --git a/.idea/libraries/Maven__com_destroystokyo_paper_paper_api_1_13_2_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_destroystokyo_paper_paper_api_1_13_2_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/PickupSpawners.iml b/PickupSpawners.iml
@@ -21,12 +21,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.14.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
@@ -40,7 +40,7 @@
     <orderEntry type="module-library">
       <library name="Maven: net.milkbowl.vault:VaultAPI:1.7">
         <CLASSES>
-          <root url="jar://$USER_HOME$/eclipse-workspace/Vault.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/Vault.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

diff --git a/pom.xml b/pom.xml
@@ -30,6 +30,12 @@
 			<version>1.14.1-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.spigotmc</groupId>
+			<artifactId>spigot-api</artifactId>
+			<version>1.15-R0.1-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.destroystokyo.paper</groupId>
 			<artifactId>paper-api</artifactId>

diff --git a/src/main/java/me/poma123/spawners/Listener.java b/src/main/java/me/poma123/spawners/Listener.java
@@ -68,13 +68,14 @@ public class Listener implements org.bukkit.event.Listener {
     private Material material = PickupSpawners.material;
 
     public static String getLang(Player p) {
-        String[] s = StringUtils.split(p.spigot().getLocale(), '_');
+        String[] s = StringUtils.split(p.getLocale(), '_');
         return s[0];
     }
 
     public static String getLangExact(Player p) {
 
-        return p.spigot().getLocale();
+
+        return p.getLocale();
 
     }
 

diff --git a/src/main/java/me/poma123/spawners/PickupSpawners.java b/src/main/java/me/poma123/spawners/PickupSpawners.java
@@ -115,9 +115,9 @@ public void onEnable() {
         /*
          * Spawner material setting by version
          */
-        if (getVersion().contains("1_14")) {
+        if (getVersion().contains("1_14") || getVersion().contains("1_15")) {
             material = Material.getMaterial("SPAWNER");
-            getLogger().info("1.14 native version detected. Configuring 1.14 compatibility...");
+            getLogger().info("1.14+ native version detected. Configuring 1.14+ compatibility...");
             getLogger().info("Done!");
         } else if (getVersion().contains("1_13")) {
             material = Material.getMaterial("SPAWNER");
@@ -136,7 +136,7 @@ public void onEnable() {
 
         for (EntityType entity : EntityType.values()) {
             String list1 = "ILLUSIONER, GIANT, ENDER_DRAGON, WITHER, MUSHROOM_COW, SNOWMAN, IRON_GOLEM";
-            if (getVersion().contains("1_14")) {
+            if (getVersion().contains("1_14") || getVersion().contains("1_15")) {
 
                 if (entity.toString().toLowerCase().equals("pig_zombie")) {
                     if (debug) {

diff --git a/src/main/java/me/poma123/spawners/gui/PickupGui.java b/src/main/java/me/poma123/spawners/gui/PickupGui.java
@@ -252,7 +252,7 @@ public void spawnerGiveList(Player p, int page) {
 
         List<String> listByPage = sublists.get(page - 1);
 
-        if (ps.getVersion().contains("1_13_R") || ps.getVersion().contains("1_14_")) {
+        if (ps.getVersion().contains("1_13_R") || ps.getVersion().contains("1_14_") || ps.getVersion().contains("1_15_")) {
             for (String s : listByPage) {
                 if (s.equalsIgnoreCase("pig_zombie")) {
                     ItemStack item = new ItemStack(Material.ZOMBIE_PIGMAN_SPAWN_EGG);