Skip to content

Commit 592b28e

Browse files
DrkMatr1984DrkMatr1984
committed
Update to 1.15
1 parent 2104d87 commit 592b28e

24 files changed

Lines changed: 3733 additions & 302 deletions

‎pom.xml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<maven.compiler.target>1.8</maven.compiler.target>
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
</properties>
17-
17+
1818
<build>
1919
<plugins>
2020
<plugin>
@@ -41,6 +41,11 @@
4141
<shadedPattern>com.chrismin13.additionsapi.apache.http</shadedPattern>
4242
</relocation>
4343
</relocations>
44+
<artifactSet>
45+
<includes>
46+
<include>commons-io:commons-io</include>
47+
</includes>
48+
</artifactSet>
4449
</configuration>
4550
<version>3.2.1</version>
4651
<executions>
@@ -58,7 +63,7 @@
5863
<artifactId>maven-jar-plugin</artifactId>
5964
<version>2.3.2</version>
6065
<configuration>
61-
<finalName>AdditionsAPI-for-1.9-1.12</finalName>
66+
<finalName>AdditionsAPI-for-1.15</finalName>
6267
</configuration>
6368
</plugin>
6469
</plugins>
@@ -93,8 +98,7 @@
9398
<dependency>
9499
<groupId>org.spigotmc</groupId>
95100
<artifactId>spigot-api</artifactId>
96-
<version>1.12.2-R0.1-SNAPSHOT</version>
97-
<scope>provided</scope>
101+
<version>1.15-R0.1-SNAPSHOT</version>
98102
</dependency>
99103

100104
<dependency>
@@ -115,6 +119,13 @@
115119
<artifactId>jaxb-api</artifactId>
116120
<version>2.3.0</version>
117121
</dependency>
122+
123+
<!-- This library is included in 1.13, but not in 1.14. -->
124+
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
125+
<dependency>
126+
<groupId>commons-io</groupId>
127+
<artifactId>commons-io</artifactId>
128+
<version>2.6</version>
129+
</dependency>
118130
</dependencies>
119-
120131
</project>

‎src/main/java/com/chrismin13/additionsapi/AdditionsAPI.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import com.chrismin13.additionsapi.listeners.vanilla.PlayerShearEntity;
6464
import com.chrismin13.additionsapi.recipes.CustomRecipe;
6565
import com.chrismin13.additionsapi.utils.Debug;
66+
import com.chrismin13.additionsapi.utils.MaterialUtils;
6667
import com.codingforcookies.armorequip.ArmorListener;
6768
import com.comphenix.attribute.NbtFactory;
6869
import com.comphenix.attribute.NbtFactory.NbtCompound;
@@ -76,11 +77,8 @@
7677
public class AdditionsAPI extends JavaPlugin implements Listener {
7778

7879
private static JavaPlugin instance;
79-
private static String mcver = Bukkit.getServer().getVersion();
8080

8181
public void onEnable() {
82-
83-
System.out.println("Hello Tutorial World!");
8482

8583
instance = this;
8684

@@ -158,6 +156,15 @@ this, new ArrowFromCustomBowHit(), new PlayerDeath(), new DurabilityBar(), new F
158156
PluginCommand additions = getCommand("additions");
159157
additions.setExecutor(new AdditionsCmd());
160158
additions.setTabCompleter(new AdditionsTab());
159+
160+
// Check if the server has the methods I added to Spigot (anything newer than around the 6th of August 2018 should be good)
161+
try {
162+
Material.DIAMOND_BLOCK.isInteractable();
163+
Material.DIAMOND_BLOCK.getHardness();
164+
Material.DIAMOND_BLOCK.getBlastResistance();
165+
} catch (NoSuchMethodError e) {
166+
MaterialUtils.useNewMethods = false;
167+
}
161168

162169
// Commented out - these are not ready yet. Works on Linux but still fighting
163170
// for the rest of the OSes.
@@ -276,17 +283,12 @@ public void onInitialization(AdditionsAPIInitializationEvent event) {
276283
ItemStack item = cStack.getItemStack();
277284
cStacks.add(cStack);
278285
if (cItemConfig.canBeCreated()) {
279-
if (mcver.contains("1.9") || mcver.contains("1.10") || mcver.contains("1.11")) {
280-
for (CustomRecipe cRecipe : cItem.getCustomRecipes())
281-
cRecipe.registerBukkitRecipe(item);
282-
} else {
283-
String[] idPart = idName.split(":");
284-
int i = 1;
285-
for (CustomRecipe cRecipe : cItem.getCustomRecipes()) {
286-
NamespacedKey key = new NamespacedKey(idPart[0], idPart[1] + "_" + i);
287-
cRecipe.registerBukkitRecipe(key, item);
288-
i++;
289-
}
286+
String[] idPart = idName.split(":");
287+
int i = 1;
288+
for (CustomRecipe cRecipe : cItem.getCustomRecipes()) {
289+
NamespacedKey key = new NamespacedKey(idPart[0], idPart[1] + "_" + i);
290+
cRecipe.registerBukkitRecipe(key, item);
291+
i++;
290292
}
291293
}
292294
}
@@ -345,6 +347,7 @@ public static void clearAll() {
345347
public static String getIdName(ItemStack item) {
346348
if (item == null || item.getType().equals(Material.AIR))
347349
return null;
350+
348351
ItemStack stack = NbtFactory.getCraftItemStack(item.clone());
349352
NbtCompound nbt = NbtFactory.fromItemTag(stack);
350353
return nbt.getString("CustomItem.IdName", null);

‎src/main/java/com/chrismin13/additionsapi/commands/AdditionsCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
189189
} else {
190190
cStack.setFakeDurability(cStack.getMaxFakeDurability());
191191
}
192-
} else if (item.getItemMeta().spigot().isUnbreakable() || item.getType().getMaxDurability() == (short) 0) {
192+
} else if (item.getItemMeta().isUnbreakable() || item.getType().getMaxDurability() == (short) 0) {
193193
sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "===--- Additions API by chrismin13 ---===");
194194
sender.sendMessage(ChatColor.GREEN + " ---=== Repair Command ===---");
195195
sender.sendMessage("");

‎src/main/java/com/chrismin13/additionsapi/durability/ShearDurability.java‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,28 @@ public class ShearDurability extends ItemDurability {
2121

2222
public ShearDurability() {
2323
super.setInstantBlockBreak(1);
24-
super.addSpecialBlock(Material.WEB, 1);
25-
super.addSpecialBlock(Material.LEAVES, 1);
26-
super.addSpecialBlock(Material.LEAVES_2, 1);
27-
super.addSpecialBlock(Material.WOOL, 1);
24+
super.addSpecialBlock(Material.COBWEB, 1);
25+
super.addSpecialBlock(Material.ACACIA_LEAVES, 1);
26+
super.addSpecialBlock(Material.BIRCH_LEAVES, 1);
27+
super.addSpecialBlock(Material.JUNGLE_LEAVES, 1);
28+
super.addSpecialBlock(Material.OAK_LEAVES, 1);
29+
super.addSpecialBlock(Material.SPRUCE_LEAVES, 1);
30+
super.addSpecialBlock(Material.BLACK_WOOL, 1);
31+
super.addSpecialBlock(Material.BLUE_WOOL, 1);
32+
super.addSpecialBlock(Material.BROWN_WOOL, 1);
33+
super.addSpecialBlock(Material.CYAN_WOOL, 1);
34+
super.addSpecialBlock(Material.GRAY_WOOL, 1);
35+
super.addSpecialBlock(Material.GREEN_WOOL, 1);
36+
super.addSpecialBlock(Material.LIME_WOOL, 1);
37+
super.addSpecialBlock(Material.MAGENTA_WOOL, 1);
38+
super.addSpecialBlock(Material.ORANGE_WOOL, 1);
39+
super.addSpecialBlock(Material.PINK_WOOL, 1);
40+
super.addSpecialBlock(Material.PURPLE_WOOL, 1);
41+
super.addSpecialBlock(Material.RED_WOOL, 1);
42+
super.addSpecialBlock(Material.WHITE_WOOL, 1);
43+
super.addSpecialBlock(Material.YELLOW_WOOL, 1);
44+
super.addSpecialBlock(Material.LIGHT_BLUE_WOOL, 1);
45+
super.addSpecialBlock(Material.LIGHT_GRAY_WOOL, 1);
2846
super.addSpecialBlock(Material.VINE, 1);
2947
}
3048

‎src/main/java/com/chrismin13/additionsapi/enums/ArmorType.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ public Material getChainmailMaterial() {
6464
public Material getGoldMaterial() {
6565
switch (this) {
6666
case HELMET:
67-
return Material.GOLD_HELMET;
67+
return Material.GOLDEN_HELMET;
6868
case CHESTPLATE:
69-
return Material.GOLD_CHESTPLATE;
69+
return Material.GOLDEN_CHESTPLATE;
7070
case LEGGINGS:
71-
return Material.GOLD_LEGGINGS;
71+
return Material.GOLDEN_LEGGINGS;
7272
case BOOTS:
73-
return Material.GOLD_BOOTS;
73+
return Material.GOLDEN_BOOTS;
7474
default:
7575
return null;
7676
}
@@ -162,25 +162,25 @@ public static ArmorType getArmorType(ItemStack item) {
162162
public static ArmorType getArmorType(Material material) {
163163
switch (material) {
164164
case DIAMOND_HELMET:
165-
case GOLD_HELMET:
165+
case GOLDEN_HELMET:
166166
case IRON_HELMET:
167167
case CHAINMAIL_HELMET:
168168
case LEATHER_HELMET:
169169
return HELMET;
170170
case DIAMOND_CHESTPLATE:
171-
case GOLD_CHESTPLATE:
171+
case GOLDEN_CHESTPLATE:
172172
case IRON_CHESTPLATE:
173173
case CHAINMAIL_CHESTPLATE:
174174
case LEATHER_CHESTPLATE:
175175
return CHESTPLATE;
176176
case DIAMOND_LEGGINGS:
177-
case GOLD_LEGGINGS:
177+
case GOLDEN_LEGGINGS:
178178
case IRON_LEGGINGS:
179179
case CHAINMAIL_LEGGINGS:
180180
case LEATHER_LEGGINGS:
181181
return LEGGINGS;
182182
case DIAMOND_BOOTS:
183-
case GOLD_BOOTS:
183+
case GOLDEN_BOOTS:
184184
case IRON_BOOTS:
185185
case CHAINMAIL_BOOTS:
186186
case LEATHER_BOOTS:

0 commit comments

Comments
 (0)