From b5fa41cdc1a91fd8b41b1da1ba757196a2e54f19 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 20 Dec 2020 21:03:53 -0500 Subject: [PATCH] Fix nms environments for nether and end --- .../java/com/volmit/iris/nms/v16_2/NMSBinding16_2.java | 5 +++++ .../java/com/volmit/iris/nms/v16_3/NMSBinding16_3.java | 5 +++++ src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java | 5 +++++ .../com/volmit/iris/util/RegistryListStructurePiece.java | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/nms/v16_2/NMSBinding16_2.java b/src/main/java/com/volmit/iris/nms/v16_2/NMSBinding16_2.java index 76f4c4ec5..7f1475582 100644 --- a/src/main/java/com/volmit/iris/nms/v16_2/NMSBinding16_2.java +++ b/src/main/java/com/volmit/iris/nms/v16_2/NMSBinding16_2.java @@ -40,4 +40,9 @@ public class NMSBinding16_2 implements INMSBinding baseBiomeCache.put(biome, v); return v; } + + @Override + public boolean isBukkit() { + return false; + } } diff --git a/src/main/java/com/volmit/iris/nms/v16_3/NMSBinding16_3.java b/src/main/java/com/volmit/iris/nms/v16_3/NMSBinding16_3.java index 9bb14a7b9..f24b1a83e 100644 --- a/src/main/java/com/volmit/iris/nms/v16_3/NMSBinding16_3.java +++ b/src/main/java/com/volmit/iris/nms/v16_3/NMSBinding16_3.java @@ -39,4 +39,9 @@ public class NMSBinding16_3 implements INMSBinding baseBiomeCache.put(biome, v); return v; } + + @Override + public boolean isBukkit() { + return false; + } } diff --git a/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java index 828900600..6633ec8ba 100644 --- a/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java +++ b/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java @@ -25,4 +25,9 @@ public class NMSBinding1X implements INMSBinding public Object getBiomeBase(Object registry, Biome biome) { return null; } + + @Override + public boolean isBukkit() { + return true; + } } diff --git a/src/main/java/com/volmit/iris/util/RegistryListStructurePiece.java b/src/main/java/com/volmit/iris/util/RegistryListStructurePiece.java index fdd7fed1f..a21b99e4b 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListStructurePiece.java +++ b/src/main/java/com/volmit/iris/util/RegistryListStructurePiece.java @@ -1,14 +1,14 @@ package com.volmit.iris.util; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) -public @interface RegistryListStructure +public @interface RegistryListStructurePiece { }