Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-24 01:29:16 +00:00
Code Issues Releases Activity

1.20

Browse Source
This commit is contained in:
Brian Neumann-Fopiano
2023-06-11 13:05:23 -04:00
parent b0c96be841
commit d9bf91afa5
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -25,7 +25,7 @@ plugins {
} }
version '2.7.0-1.20.0' version '2.7.0-1.20.0'
def nmsVersion = "1.20" //[NMS] def nmsVersion = '1.20' //[NMS]
def apiVersion = '1.20' def apiVersion = '1.20'
def specialSourceVersion = '1.11.0' //[NMS] def specialSourceVersion = '1.11.0' //[NMS]
def spigotJarVersion = '1.20-R0.1-SNAPSHOT' //[NMS] def spigotJarVersion = '1.20-R0.1-SNAPSHOT' //[NMS]

6
src/main/java/com/volmit/iris/Iris.java
View File

@@ -28,7 +28,7 @@ import com.volmit.iris.core.link.MultiverseCoreLink;
import com.volmit.iris.core.link.MythicMobsLink; import com.volmit.iris.core.link.MythicMobsLink;
import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.core.nms.INMS; 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.pregenerator.LazyPregenerator;
import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.service.StudioSVC;
import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.core.tools.IrisToolbelt;
@@ -579,13 +579,13 @@ public class Iris extends VolmitPlugin implements Listener {
private boolean setupChecks() { private boolean setupChecks() {
boolean passed = true; boolean passed = true;
Iris.info("Version Information: " + instance.getServer().getVersion() + " | " + instance.getServer().getBukkitVersion()); 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; passed = false;
Iris.warn("============================================"); Iris.warn("============================================");
Iris.warn("="); Iris.warn("=");
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("="); Iris.warn("=");
Iris.warn("="); Iris.warn("=");

4
src/main/java/com/volmit/iris/core/nms/INMS.java
View File

@@ -20,7 +20,7 @@ package com.volmit.iris.core.nms;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings; 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.core.nms.v1X.NMSBinding1X;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@@ -28,7 +28,7 @@ import org.bukkit.Bukkit;
public class INMS { public class INMS {
//@builder //@builder
private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>() 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 //@done
private static final INMSBinding binding = bind(); private static final INMSBinding binding = bind();

4
src/main/java/com/volmit/iris/core/nms/v20/NMSBinding19_4.java → src/main/java/com/volmit/iris/core/nms/v20/NMSBinding1_20.java
View File

@@ -67,9 +67,9 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; 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 KMap<Biome, Object> baseBiomeCache = new KMap<>();
private final BlockData AIR = Material.AIR.createBlockData(); private final BlockData AIR = Material.AIR.createBlockData();
private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>(); private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>();

2
src/main/resources/plugin.yml
View File

@@ -20,5 +20,5 @@ libraries:
commands: commands:
iris: iris:
aliases: [ ir, irs ] aliases: [ ir, irs ]
api-version: ${apiversion} api-version: '${apiversion}'
hotload-dependencies: false hotload-dependencies: false