diff --git a/build.gradle b/build.gradle index 6c87ec1b2..e5df1f140 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { } version '2.7.0-1.20.0' -def nmsVersion = "1.20" //[NMS] +def nmsVersion = '1.20' //[NMS] def apiVersion = '1.20' def specialSourceVersion = '1.11.0' //[NMS] def spigotJarVersion = '1.20-R0.1-SNAPSHOT' //[NMS] diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 28eba4ec8..aca1d4cbe 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -28,7 +28,7 @@ import com.volmit.iris.core.link.MythicMobsLink; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.core.nms.v20.NMSBinding19_4; +import com.volmit.iris.core.nms.v20.NMSBinding1_20; import com.volmit.iris.core.pregenerator.LazyPregenerator; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; @@ -579,13 +579,13 @@ public String getTag(String subTag) { private boolean setupChecks() { boolean passed = true; Iris.info("Version Information: " + instance.getServer().getVersion() + " | " + instance.getServer().getBukkitVersion()); - if (!instance.getServer().getBukkitVersion().contains(NMSBinding19_4.NMS_VERSION)) { + if (!instance.getServer().getBukkitVersion().contains(NMSBinding1_20.NMS_VERSION)) { passed = false; Iris.warn("============================================"); Iris.warn("="); Iris.warn("="); Iris.warn("="); - Iris.warn("Iris is not compatible with this version of Minecraft.\nPlease use " + NMSBinding19_4.NMS_VERSION + " or use an older version of Iris."); + Iris.warn("Iris is not compatible with this version of Minecraft.\nPlease use " + NMSBinding1_20.NMS_VERSION + " or use an older version of Iris."); Iris.warn("="); Iris.warn("="); Iris.warn("="); diff --git a/src/main/java/com/volmit/iris/core/nms/INMS.java b/src/main/java/com/volmit/iris/core/nms/INMS.java index 7ce535e77..931c90a4f 100644 --- a/src/main/java/com/volmit/iris/core/nms/INMS.java +++ b/src/main/java/com/volmit/iris/core/nms/INMS.java @@ -20,7 +20,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.core.nms.v20.NMSBinding19_4; +import com.volmit.iris.core.nms.v20.NMSBinding1_20; import com.volmit.iris.core.nms.v1X.NMSBinding1X; import com.volmit.iris.util.collection.KMap; import org.bukkit.Bukkit; @@ -28,7 +28,7 @@ public class INMS { //@builder private static final KMap> bindings = new KMap>() - .qput("v1_19_R3", NMSBinding19_4.class); + .qput("v1_20_R1", NMSBinding1_20.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding19_4.java b/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java similarity index 96% rename from src/main/java/com/volmit/iris/core/nms/v20/NMSBinding19_4.java rename to src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java index e73bf51dc..4b135d263 100644 --- a/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding19_4.java +++ b/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java @@ -67,9 +67,9 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -public class NMSBinding19_4 implements INMSBinding { +public class NMSBinding1_20 implements INMSBinding { - public static final String NMS_VERSION = "1.19.4"; + public static final String NMS_VERSION = "1.20"; private final KMap baseBiomeCache = new KMap<>(); private final BlockData AIR = Material.AIR.createBlockData(); private final AtomicCache> biomeMapCache = new AtomicCache<>(); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d74711876..052267332 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -20,5 +20,5 @@ libraries: commands: iris: aliases: [ ir, irs ] -api-version: ${apiversion} +api-version: '${apiversion}' hotload-dependencies: false \ No newline at end of file