From 01b08b2297d7354cc1e35392de568390e15e2aa9 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 16 Mar 2022 19:31:43 -0700 Subject: [PATCH] Revert "Partial For Vatuu to look at NMS" This reverts commit cf51581ac14281eb26db6ef4afff7d7ca9785f9b. --- build.gradle | 10 +++++----- src/main/java/com/volmit/iris/core/nms/INMS.java | 4 ++-- .../NMSBinding18_1.java} | 14 +++++++------- .../com/volmit/iris/engine/object/IrisLoot.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/com/volmit/iris/core/nms/{v18_2/NMSBinding18_2.java => v18_1/NMSBinding18_1.java} (97%) diff --git a/build.gradle b/build.gradle index ec43cff5d..2f563507e 100644 --- a/build.gradle +++ b/build.gradle @@ -25,10 +25,10 @@ plugins { } group 'com.volmit.iris' -version '2.0.3-1.18.X' -def nmsVersion = "1.18.2" +version '2.0.2-1.18.X' +def nmsVersion = "1.18.1" def apiVersion = '1.18' -def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT' +def spigotJarVersion = '1.18.1-R0.1-SNAPSHOT' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' @@ -123,10 +123,10 @@ dependencies { // Provided or Classpath compileOnly 'org.projectlombok:lombok:1.18.22' annotationProcessor 'org.projectlombok:lombok:1.18.22' - implementation 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT' + implementation 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT' implementation 'me.clip:placeholderapi:2.10.10' implementation 'io.th0rgal:oraxen:1.94.0' - implementation 'org.bukkit:craftbukkit:1.18.2-R0.1-SNAPSHOT:remapped-mojang' + implementation 'org.bukkit:craftbukkit:1.18.1-R0.1-SNAPSHOT:remapped-mojang' // Shaded implementation 'com.dfsek:Paralithic:0.4.0' 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 1dbec5c8e..57ab87c32 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.v18_2.NMSBinding18_2; +import com.volmit.iris.core.nms.v18_1.NMSBinding18_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_18_R1", NMSBinding18_2.class); + .qput("v1_18_R1", NMSBinding18_1.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java b/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java similarity index 97% rename from src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java rename to src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java index 28606c325..069c71fe4 100644 --- a/src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java +++ b/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.core.nms.v18_2; +package com.volmit.iris.core.nms.v18_1; import com.volmit.iris.Iris; @@ -52,9 +52,9 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_18_R2.CraftServer; -import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_18_R1.CraftServer; +import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData; import org.bukkit.entity.Entity; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; @@ -70,7 +70,7 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -public class NMSBinding18_2 implements INMSBinding { +public class NMSBinding18_1 implements INMSBinding { private final KMap baseBiomeCache = new KMap<>(); private final BlockData AIR = Material.AIR.createBlockData(); @@ -229,13 +229,13 @@ public class NMSBinding18_2 implements INMSBinding { return v; } //noinspection unchecked - v = org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock.biomeToBiomeBase((Registry) registry, biome); + v = org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, biome); if(v == null) { // Ok so there is this new biome name called "CUSTOM" in Paper's new releases. // But, this does NOT exist within CraftBukkit which makes it return an error. // So, we will just return the ID that the plains biome returns instead. //noinspection unchecked - return org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); + return org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); } baseBiomeCache.put(biome, v); return v; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java index a697171a6..1ebc0ddf3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -44,7 +44,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.TagParser; import org.bukkit.DyeColor; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable;