diff --git a/build.gradle b/build.gradle index e5df1f140..d8de1a21e 100644 --- a/build.gradle +++ b/build.gradle @@ -24,11 +24,11 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '2.7.0-1.20.0' -def nmsVersion = '1.20' //[NMS] +version '2.7.1-1.20.1' +def nmsVersion = '1.20.1' //[NMS] def apiVersion = '1.20' def specialSourceVersion = '1.11.0' //[NMS] -def spigotJarVersion = '1.20-R0.1-SNAPSHOT' //[NMS] +def spigotJarVersion = '1.20.1-R0.1-SNAPSHOT' //[NMS] def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' @@ -129,8 +129,8 @@ dependencies { // Provided or Classpath compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' - implementation 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT' - implementation 'org.bukkit:craftbukkit:1.20-R0.1-SNAPSHOT:remapped-mojang' //[NMS] + implementation 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT' + implementation 'org.bukkit:craftbukkit:1.20.1-R0.1-SNAPSHOT:remapped-mojang' //[NMS] // Third Party Integrations implementation 'com.github.oraxen:oraxen:1.152.5' diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 4b080e225..2935bc1be 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.MultiverseCoreLink; 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.NMSBinding1_20; +import com.volmit.iris.core.nms.v20.NMSBinding1_20_1; 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 class Iris extends VolmitPlugin implements Listener { private boolean setupChecks() { boolean passed = true; Iris.info("Version Information: " + instance.getServer().getVersion() + " | " + instance.getServer().getBukkitVersion()); - if (!instance.getServer().getBukkitVersion().contains(NMSBinding1_20.NMS_VERSION)) { + if (!instance.getServer().getBukkitVersion().contains(NMSBinding1_20_1.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 " + NMSBinding1_20.NMS_VERSION + " or use an older version of Iris."); + Iris.warn("Iris is not compatible with this version of Minecraft.\nPlease use " + NMSBinding1_20_1.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 931c90a4f..2274aa23b 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 @@ package com.volmit.iris.core.nms; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.core.nms.v20.NMSBinding1_20; +import com.volmit.iris.core.nms.v20.NMSBinding1_20_1; import com.volmit.iris.core.nms.v1X.NMSBinding1X; import com.volmit.iris.util.collection.KMap; import org.bukkit.Bukkit; @@ -28,7 +28,7 @@ import org.bukkit.Bukkit; public class INMS { //@builder private static final KMap> bindings = new KMap>() - .qput("v1_20_R1", NMSBinding1_20.class); + .qput("v1_20_R1", NMSBinding1_20_1.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java b/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20_1.java similarity index 96% rename from src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java rename to src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20_1.java index 4b135d263..71f17640b 100644 --- a/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java +++ b/src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20_1.java @@ -67,9 +67,9 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -public class NMSBinding1_20 implements INMSBinding { +public class NMSBinding1_20_1 implements INMSBinding { - public static final String NMS_VERSION = "1.20"; + public static final String NMS_VERSION = "1.20.1"; private final KMap baseBiomeCache = new KMap<>(); private final BlockData AIR = Material.AIR.createBlockData(); private final AtomicCache> biomeMapCache = new AtomicCache<>();