Skip to content

Commit

Permalink
1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
NextdoorPsycho committed Jun 11, 2023
1 parent b0c96be commit d9bf91a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/volmit/iris/Iris.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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("=");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/volmit/iris/core/nms/INMS.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

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;

public class INMS {
//@builder
private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
.qput("v1_19_R3", NMSBinding19_4.class);
.qput("v1_20_R1", NMSBinding1_20.class);
//@done
private static final INMSBinding binding = bind();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Biome, Object> baseBiomeCache = new KMap<>();
private final BlockData AIR = Material.AIR.createBlockData();
private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ libraries:
commands:
iris:
aliases: [ ir, irs ]
api-version: ${apiversion}
api-version: '${apiversion}'
hotload-dependencies: false

0 comments on commit d9bf91a

Please sign in to comment.