Switch to Spigot API and bump version to 1.17.
Spigot has decided to discontinue distribution of the Bukkit artifacts, which means Bukkit "doesn't exist" after Minecraft 1.15. This commit takes the plunge on that change and moves to the Spigot API rather than the Bukkit API. Goodbye, Bukkit. Hello, Spigot. The version is also bumped to 1.17 to give way to new features and bug fixes otherwise blocked by staying on 1.13. Unfortunately, this brings with it a swath of potential issues with version compatibility going forward, because backwards compatibility in the API sometimes takes a back seat, such as with the Material and EntityType enums. This commit specifically changes some references that break compatibility with older server versions, but compatibility with those is reinstated later. Finally, the Spigot repository is changed to match the consensus about which path on the Spigot Nexus instance to use. This seems to be what everyone else is doing, so `bandwagon.jumpOn()`.
This commit is contained in:
@@ -74,7 +74,7 @@
|
|||||||
<!-- Spigot repo -->
|
<!-- Spigot repo -->
|
||||||
<repository>
|
<repository>
|
||||||
<id>spigot-repo</id>
|
<id>spigot-repo</id>
|
||||||
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
|
||||||
<!-- JitPack for Vault -->
|
<!-- JitPack for Vault -->
|
||||||
@@ -85,11 +85,11 @@
|
|||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- Spigot-Bukkit API -->
|
<!-- Spigot API -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>bukkit</artifactId>
|
<artifactId>spigot-api</artifactId>
|
||||||
<version>1.13-R0.1-SNAPSHOT</version>
|
<version>1.17-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ public class MAUtils
|
|||||||
// Place the hippie signs
|
// Place the hippie signs
|
||||||
//Iterator<String> iterator = am.getClasses().iterator();
|
//Iterator<String> iterator = am.getClasses().iterator();
|
||||||
Iterator<ArenaClass> iterator = am.getClasses().values().iterator();
|
Iterator<ArenaClass> iterator = am.getClasses().values().iterator();
|
||||||
Rotatable signData = (Rotatable) Material.SIGN.createBlockData();
|
Rotatable signData = (Rotatable) Material.OAK_SIGN.createBlockData();
|
||||||
signData.setRotation(BlockFace.NORTH);
|
signData.setRotation(BlockFace.NORTH);
|
||||||
for (int i = lx1+2; i <= lx2-2; i++) // Signs
|
for (int i = lx1+2; i <= lx2-2; i++) // Signs
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ public class ClassChests {
|
|||||||
Block blockBehind = blockBelow.getRelative(backwards);
|
Block blockBehind = blockBelow.getRelative(backwards);
|
||||||
|
|
||||||
// If the block below this sign is a class sign, swap the order
|
// If the block below this sign is a class sign, swap the order
|
||||||
if (blockBelow.getType() == Material.WALL_SIGN || blockBelow.getType() == Material.SIGN) {
|
if (blockBelow.getType() == Material.OAK_WALL_SIGN || blockBelow.getType() == Material.OAK_SIGN) {
|
||||||
String className = ChatColor.stripColor(((Sign) blockBelow.getState()).getLine(0)).toLowerCase();
|
String className = ChatColor.stripColor(((Sign) blockBelow.getState()).getLine(0)).toLowerCase();
|
||||||
if (arena.getClasses().containsKey(className)) {
|
if (arena.getClasses().containsKey(className)) {
|
||||||
blockSign = blockBehind; // Use blockSign as a temp while swapping
|
blockSign = blockBehind; // Use blockSign as a temp while swapping
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class MACreature
|
|||||||
public static final MACreature WOLF = new MACreature("wolf", "wolves", EntityType.WOLF);
|
public static final MACreature WOLF = new MACreature("wolf", "wolves", EntityType.WOLF);
|
||||||
|
|
||||||
// Special creatures
|
// Special creatures
|
||||||
public static final MACreature ZOMBIEPIGMAN = new MACreature("zombiepigman", "zombiepigmen", EntityType.PIG_ZOMBIE);
|
public static final MACreature ZOMBIEPIGMAN = new MACreature("zombiepigman", "zombiepigmen", EntityType.ZOMBIFIED_PIGLIN);
|
||||||
public static final MACreature POWEREDCREEPER = new MACreature("poweredcreeper", EntityType.CREEPER);
|
public static final MACreature POWEREDCREEPER = new MACreature("poweredcreeper", EntityType.CREEPER);
|
||||||
public static final MACreature ANGRYWOLF = new MACreature("angrywolf", "angrywolves", EntityType.WOLF);
|
public static final MACreature ANGRYWOLF = new MACreature("angrywolf", "angrywolves", EntityType.WOLF);
|
||||||
public static final MACreature ENDERMAN = new MACreature("enderman", "endermen", EntityType.ENDERMAN);
|
public static final MACreature ENDERMAN = new MACreature("enderman", "endermen", EntityType.ENDERMAN);
|
||||||
@@ -76,7 +76,7 @@ public class MACreature
|
|||||||
// 1.4 creatures
|
// 1.4 creatures
|
||||||
public static final MACreature WITCH = new MACreature("witch", "witches", EntityType.WITCH);
|
public static final MACreature WITCH = new MACreature("witch", "witches", EntityType.WITCH);
|
||||||
public static final MACreature BABYZOMBIE = new MACreature("babyzombie", EntityType.ZOMBIE);
|
public static final MACreature BABYZOMBIE = new MACreature("babyzombie", EntityType.ZOMBIE);
|
||||||
public static final MACreature BABYPIGMAN = new MACreature("babypigman", "babypigmen", EntityType.PIG_ZOMBIE);
|
public static final MACreature BABYPIGMAN = new MACreature("babypigman", "babypigmen", EntityType.ZOMBIFIED_PIGLIN);
|
||||||
public static final MACreature BABYZOMBIEVILLAGER = new MACreature("babyzombievillager", EntityType.ZOMBIE_VILLAGER);
|
public static final MACreature BABYZOMBIEVILLAGER = new MACreature("babyzombievillager", EntityType.ZOMBIE_VILLAGER);
|
||||||
|
|
||||||
// 1.6 creatures
|
// 1.6 creatures
|
||||||
@@ -175,11 +175,13 @@ public class MACreature
|
|||||||
((Zombie) e).setBaby(true);
|
((Zombie) e).setBaby(true);
|
||||||
break;
|
break;
|
||||||
case "babypigman":
|
case "babypigman":
|
||||||
|
case "babyzombifiedpiglin":
|
||||||
((Zombie) e).setBaby(true);
|
((Zombie) e).setBaby(true);
|
||||||
((PigZombie) e).setAngry(true);
|
((PigZombie) e).setAngry(true);
|
||||||
break;
|
break;
|
||||||
case "pigzombie":
|
case "pigzombie":
|
||||||
case "zombiepigman":
|
case "zombiepigman":
|
||||||
|
case "zombifiedpiglin":
|
||||||
((PigZombie) e).setAngry(true);
|
((PigZombie) e).setAngry(true);
|
||||||
break;
|
break;
|
||||||
case "killerbunny":
|
case "killerbunny":
|
||||||
|
|||||||
Reference in New Issue
Block a user