Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Commit 9bf8b60

Browse files
poma123poma123
committed
1.15 support
1 parent 6494e21 commit 9bf8b60

8 files changed

Lines changed: 113 additions & 108 deletions

File tree

‎.idea/libraries/Maven__com_destroystokyo_paper_paper_api_1_13_2_R0_1_SNAPSHOT.xml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.idea/workspace.xml‎

Lines changed: 94 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PickupSpawners.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
</content>
2222
<orderEntry type="inheritedJdk" />
2323
<orderEntry type="sourceFolder" forTests="false" />
24-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.14.1-R0.1-SNAPSHOT" level="project" />
24+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
2525
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
2626
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
2727
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
2828
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
29-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
29+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
3030
<orderEntry type="library" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT" level="project" />
3131
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
3232
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
@@ -40,7 +40,7 @@
4040
<orderEntry type="module-library">
4141
<library name="Maven: net.milkbowl.vault:VaultAPI:1.7">
4242
<CLASSES>
43-
<root url="jar://$USER_HOME$/eclipse-workspace/Vault.jar!/" />
43+
<root url="jar://$MODULE_DIR$/lib/Vault.jar!/" />
4444
</CLASSES>
4545
<JAVADOC />
4646
<SOURCES />

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
<version>1.14.1-R0.1-SNAPSHOT</version>
3131
<scope>provided</scope>
3232
</dependency>
33+
<dependency>
34+
<groupId>org.spigotmc</groupId>
35+
<artifactId>spigot-api</artifactId>
36+
<version>1.15-R0.1-SNAPSHOT</version>
37+
<scope>provided</scope>
38+
</dependency>
3339
<dependency>
3440
<groupId>com.destroystokyo.paper</groupId>
3541
<artifactId>paper-api</artifactId>

‎src/main/java/me/poma123/spawners/Listener.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,14 @@ public class Listener implements org.bukkit.event.Listener {
6868
private Material material = PickupSpawners.material;
6969

7070
public static String getLang(Player p) {
71-
String[] s = StringUtils.split(p.spigot().getLocale(), '_');
71+
String[] s = StringUtils.split(p.getLocale(), '_');
7272
return s[0];
7373
}
7474

7575
public static String getLangExact(Player p) {
7676

77-
return p.spigot().getLocale();
77+
78+
return p.getLocale();
7879

7980
}
8081

‎src/main/java/me/poma123/spawners/PickupSpawners.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ public void onEnable() {
115115
/*
116116
* Spawner material setting by version
117117
*/
118-
if (getVersion().contains("1_14")) {
118+
if (getVersion().contains("1_14") || getVersion().contains("1_15")) {
119119
material = Material.getMaterial("SPAWNER");
120-
getLogger().info("1.14 native version detected. Configuring 1.14 compatibility...");
120+
getLogger().info("1.14+ native version detected. Configuring 1.14+ compatibility...");
121121
getLogger().info("Done!");
122122
} else if (getVersion().contains("1_13")) {
123123
material = Material.getMaterial("SPAWNER");
@@ -136,7 +136,7 @@ public void onEnable() {
136136

137137
for (EntityType entity : EntityType.values()) {
138138
String list1 = "ILLUSIONER, GIANT, ENDER_DRAGON, WITHER, MUSHROOM_COW, SNOWMAN, IRON_GOLEM";
139-
if (getVersion().contains("1_14")) {
139+
if (getVersion().contains("1_14") || getVersion().contains("1_15")) {
140140

141141
if (entity.toString().toLowerCase().equals("pig_zombie")) {
142142
if (debug) {

‎src/main/java/me/poma123/spawners/gui/PickupGui.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public void spawnerGiveList(Player p, int page) {
252252

253253
List<String> listByPage = sublists.get(page - 1);
254254

255-
if (ps.getVersion().contains("1_13_R") || ps.getVersion().contains("1_14_")) {
255+
if (ps.getVersion().contains("1_13_R") || ps.getVersion().contains("1_14_") || ps.getVersion().contains("1_15_")) {
256256
for (String s : listByPage) {
257257
if (s.equalsIgnoreCase("pig_zombie")) {
258258
ItemStack item = new ItemStack(Material.ZOMBIE_PIGMAN_SPAWN_EGG);

0 commit comments

Comments
 (0)