diff --git a/Core/pom.xml b/Core/pom.xml
index 6e7fb51b..49b1fc37 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -249,15 +249,15 @@
provided
- com.sainttx.holograms
+ com.sainttx
Holograms
- 2.9.1
+ 2.13
provided
- com.zrips
- CMI
- 8.4.0.2_1
+ com.github.Zrips
+ CMI-API
+ 7.6.2.0
provided
@@ -293,7 +293,7 @@
com.sk89q
worldguard-bukkit
- 7.1.0
+ 7.0.4
provided
@@ -305,13 +305,13 @@
com.songoda
UltimateStacker
- 2.0.1
+ 2.1.1
provided
- com.github.OmerBenGera
- WildStackerAPI
- b16
+ com.bgsoftware
+ wildstacker
+ 3.5.1
provided
@@ -321,14 +321,14 @@
provided
- com.gamingmesh
- jobs
- 4.13.0
+ com.github.Zrips
+ Jobs
+ LATEST
provided
- com.gmail.nossr50
- mcmmo
+ com.gmail.nossr50.mcMMO
+ mcMMO
2.1.50
provided
diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java
index 14cfb85c..5f36ec76 100644
--- a/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java
+++ b/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java
@@ -20,7 +20,7 @@ public class CMIHolograms extends Holograms {
CMI cmi;
HologramManager cmiHologramManager;
HashSet ourHolograms = new HashSet();
- Method cmi_CMIHologram_getLines;
+ Method cmi_CMIHologram_getLines, getLines;
{
try {
@@ -89,15 +89,15 @@ public class CMIHolograms extends Holograms {
if (holo != null) {
// only update if there is a change to the text
List holoLines;
- if (cmi_CMIHologram_getLines != null) {
- try {
+ try {
+ if (cmi_CMIHologram_getLines != null) {
holoLines = Arrays.asList((String[]) cmi_CMIHologram_getLines.invoke(holo));
- } catch (Exception ex) {
- Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex);
- holoLines = Collections.EMPTY_LIST;
+ } else {
+ holoLines = (List) cmi_CMIHologram_getLines.invoke(holo);
}
- } else {
- holoLines = holo.getLines();
+ } catch (Exception ex) {
+ Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex);
+ holoLines = Collections.EMPTY_LIST;
}
boolean isChanged = lines.size() != holoLines.size();
if (!isChanged) {
diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml
index 170516cb..944834e0 100644
--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.10.2
provided
diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml
index 36316d7d..68dcbf0d 100644
--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.11.2
provided
diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml
index f42a8fb9..c7b80336 100644
--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.12.2
provided
diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml
index 8ca7c5ff..593159f8 100644
--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.13
provided
diff --git a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTEntityImpl.java b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTEntityImpl.java
index 868cfddb..4055a0ca 100644
--- a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTEntityImpl.java
+++ b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTEntityImpl.java
@@ -59,7 +59,7 @@ public class NBTEntityImpl extends NBTCompoundImpl implements NBTEntity {
@Override
public void addExtras() {
- MinecraftKey key = EntityTypes.REGISTRY.b(nmsEntity.getEntityType());
+ MinecraftKey key = EntityTypes.REGISTRY.b(nmsEntity.P()); // Changed in 1.13
if (key != null)
compound.setString("entity_type", key.toString()); // Changed in 1.13
}
diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml
index ab7ecc31..deace4f5 100644
--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.13.2
provided
diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml
index 175006a7..c1c84672 100644
--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.14.4
provided
diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml
index 8566265f..a0acfa72 100644
--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@@ -14,9 +14,9 @@
- com.destroystokyo.papermc
- paper
- 1.15.1
+ org.spigotmc
+ spigot
+ 1.15
provided
diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml
index bc405117..e140b6c9 100644
--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@@ -14,9 +14,9 @@
- org.bukkit
- craftbukkit
- 1.8-R0.1-20190912.143550-1
+ org.spigotmc
+ spigot
+ 1.8
provided
diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml
index 5336a1e7..748c3453 100644
--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@@ -14,9 +14,9 @@
- org.bukkit
- craftbukkit
- 1.8.3-R0.1-20190912.192032-1
+ org.spigotmc
+ spigot
+ 1.8.3
provided
diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml
index 64f45c59..a1678033 100644
--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.8.8
provided
diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml
index 77f9361f..562f21d8 100644
--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@@ -13,16 +13,10 @@
jar
-
- org.bukkit
- craftbukkit
- 1.9.2-R0.1-20190912.192509-1
+ org.spigotmc
+ spigot
+ 1.9.2
provided
diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml
index 6a40dc70..2f55e42d 100644
--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@@ -14,8 +14,8 @@
- com.destroystokyo.papermc
- paper
+ org.spigotmc
+ spigot
1.9.4
provided
diff --git a/pom.xml b/pom.xml
index 95bcac5a..ad559c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,10 +43,6 @@
-
- private
- https://repo.songoda.com/repository/private/
-
public
https://repo.songoda.com/repository/public/
@@ -59,6 +55,10 @@
jitpack.io
https://jitpack.io
+
+ CodeMC
+ https://repo.codemc.org/repository/maven-public
+
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index 3341cca5..00000000
--- a/settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- private
- {REPO_USER}
- {REPO_PASS}
-
-
-
\ No newline at end of file