From 660aaa87cab7580fdd44b409cd66a666bf20e336 Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:20:04 +0100 Subject: [PATCH 01/12] Removed debug printout. --- src/main/java/com/volmit/iris/engine/object/IrisLoot.java | 4 ---- 1 file changed, 4 deletions(-) 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 d4678342e..1ebc0ddf3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -35,16 +35,13 @@ import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.nbt.io.NBTUtil; import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.TagParser; -import net.minecraft.server.commands.GiveCommand; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; @@ -277,7 +274,6 @@ public class IrisLoot { CompoundTag tag = TagParser.parseTag(new JSONObject(customNbt).toString()); tag.merge(s.getOrCreateTag()); s.setTag(tag); - System.out.println(customNbt); return CraftItemStack.asBukkitCopy(s); } } From d149051c27b161d3a359958484adbbb61f378094 Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:22:04 +0100 Subject: [PATCH 02/12] Fixed wrong description for /iris height. --- src/main/java/com/volmit/iris/core/commands/CommandIris.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index 50bdd1b5b..c3e5a7f1e 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -101,7 +101,7 @@ public class CommandIris implements DecreeExecutor { sender().sendMessage(C.GREEN + "Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software"); } - @Decree(description = "Print version information", origin = DecreeOrigin.PLAYER) + @Decree(description = "Print world height information", origin = DecreeOrigin.PLAYER) public void height() { sender().sendMessage(C.GREEN + "" + sender().player().getWorld().getMinHeight() + " to " + sender().player().getWorld().getMaxHeight()); sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight())); From cf51581ac14281eb26db6ef4afff7d7ca9785f9b Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 16 Mar 2022 19:31:43 -0700 Subject: [PATCH 03/12] Partial For Vatuu to look at NMS --- build.gradle | 10 +++++----- src/main/java/com/volmit/iris/core/nms/INMS.java | 4 ++-- .../NMSBinding18_2.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_1/NMSBinding18_1.java => v18_2/NMSBinding18_2.java} (97%) diff --git a/build.gradle b/build.gradle index 2f563507e..ec43cff5d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,10 +25,10 @@ plugins { } group 'com.volmit.iris' -version '2.0.2-1.18.X' -def nmsVersion = "1.18.1" +version '2.0.3-1.18.X' +def nmsVersion = "1.18.2" def apiVersion = '1.18' -def spigotJarVersion = '1.18.1-R0.1-SNAPSHOT' +def spigotJarVersion = '1.18.2-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.1-R0.1-SNAPSHOT' + implementation 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT' implementation 'me.clip:placeholderapi:2.10.10' implementation 'io.th0rgal:oraxen:1.94.0' - implementation 'org.bukkit:craftbukkit:1.18.1-R0.1-SNAPSHOT:remapped-mojang' + implementation 'org.bukkit:craftbukkit:1.18.2-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 57ab87c32..1dbec5c8e 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_1.NMSBinding18_1; +import com.volmit.iris.core.nms.v18_2.NMSBinding18_2; 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_1.class); + .qput("v1_18_R1", NMSBinding18_2.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java b/src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java similarity index 97% rename from src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java rename to src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java index 069c71fe4..28606c325 100644 --- a/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java +++ b/src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.core.nms.v18_1; +package com.volmit.iris.core.nms.v18_2; 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_R1.CraftServer; -import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData; +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.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_1 implements INMSBinding { +public class NMSBinding18_2 implements INMSBinding { private final KMap baseBiomeCache = new KMap<>(); private final BlockData AIR = Material.AIR.createBlockData(); @@ -229,13 +229,13 @@ public class NMSBinding18_1 implements INMSBinding { return v; } //noinspection unchecked - v = org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, biome); + v = org.bukkit.craftbukkit.v1_18_R2.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_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); + return org.bukkit.craftbukkit.v1_18_R2.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 1ebc0ddf3..a697171a6 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_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; From 01b08b2297d7354cc1e35392de568390e15e2aa9 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 16 Mar 2022 19:31:43 -0700 Subject: [PATCH 04/12] 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; From 8d7e76ed8110e16b84892e97d8892d5067557fe4 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 17 Mar 2022 00:36:49 -0700 Subject: [PATCH 05/12] Attempting to update NMS (Part 1 of ...) --- .../java/com/volmit/iris/core/nms/INMS.java | 4 ++-- .../com/volmit/iris/core/nms/NMSVersion.java | 4 ++++ .../NMSBinding18_2.java} | 22 +++++++++---------- .../volmit/iris/engine/object/IrisLoot.java | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) rename src/main/java/com/volmit/iris/core/nms/{v18_1/NMSBinding18_1.java => v18_2/NMSBinding18_2.java} (96%) 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 57ab87c32..4228dc965 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_1.NMSBinding18_1; +import com.volmit.iris.core.nms.v18_2.NMSBinding18_2; 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_1.class); + .qput("v1_18_R2", NMSBinding18_2.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/core/nms/NMSVersion.java b/src/main/java/com/volmit/iris/core/nms/NMSVersion.java index 5c12d9f71..a4268495d 100644 --- a/src/main/java/com/volmit/iris/core/nms/NMSVersion.java +++ b/src/main/java/com/volmit/iris/core/nms/NMSVersion.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; public enum NMSVersion { + R1_18_2, R1_18, R1_17, R1_16, @@ -98,6 +99,9 @@ public enum NMSVersion { if(tryVersion("1_18_R1")) { return R1_18; } + if(tryVersion("1_18_R2")) { + return R1_18_2; + } return null; } diff --git a/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java b/src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java similarity index 96% rename from src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java rename to src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java index 069c71fe4..7526d3506 100644 --- a/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java +++ b/src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.core.nms.v18_1; +package com.volmit.iris.core.nms.v18_2; import com.volmit.iris.Iris; @@ -36,10 +36,7 @@ import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer; import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer; import com.volmit.iris.util.nbt.tag.CompoundTag; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.minecraft.core.BlockPos; -import net.minecraft.core.IdMap; -import net.minecraft.core.Registry; -import net.minecraft.core.RegistryAccess; +import net.minecraft.core.*; import net.minecraft.nbt.NbtIo; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -52,9 +49,10 @@ 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_R1.CraftServer; -import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData; + +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.entity.Entity; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; @@ -70,7 +68,7 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -public class NMSBinding18_1 implements INMSBinding { +public class NMSBinding18_2 implements INMSBinding { private final KMap baseBiomeCache = new KMap<>(); private final BlockData AIR = Material.AIR.createBlockData(); @@ -229,13 +227,13 @@ public class NMSBinding18_1 implements INMSBinding { return v; } //noinspection unchecked - v = org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, biome); + v = org.bukkit.craftbukkit.v1_18_R2.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_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); + return org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); } baseBiomeCache.put(biome, v); return v; @@ -334,7 +332,7 @@ public class NMSBinding18_1 implements INMSBinding { public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) { try { ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk); - s.setBiome(x, y, z, (net.minecraft.world.level.biome.Biome) somethingVeryDirty); + s.setBiome(x, y, z, (Holder) somethingVeryDirty); // probably not safe? it said it wanted a holder, so i made it a holder... } catch(IllegalAccessException e) { Iris.reportError(e); e.printStackTrace(); 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 1ebc0ddf3..a697171a6 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_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; From 75726b3d34d8b20e69594688ff0f463f1ac81289 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 17 Mar 2022 00:37:03 -0700 Subject: [PATCH 06/12] Updating PAPI --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2f563507e..6f5c4fcaf 100644 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,7 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.22' annotationProcessor 'org.projectlombok:lombok:1.18.22' implementation 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT' - implementation 'me.clip:placeholderapi:2.10.10' + implementation 'me.clip:placeholderapi:2.11.1' implementation 'io.th0rgal:oraxen:1.94.0' implementation 'org.bukkit:craftbukkit:1.18.1-R0.1-SNAPSHOT:remapped-mojang' From c7d5212f82178e0f8860b4de8d73b2a03737bf89 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 17 Mar 2022 00:39:05 -0700 Subject: [PATCH 07/12] Oraxen link, and NMS WORKING, but not working Jar loads, Color Borked, ill look at it tomorrow --- build.gradle | 10 +++++----- .../java/com/volmit/iris/core/link/OraxenLink.java | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 6f5c4fcaf..a2c5a2636 100644 --- a/build.gradle +++ b/build.gradle @@ -25,10 +25,10 @@ plugins { } group 'com.volmit.iris' -version '2.0.2-1.18.X' -def nmsVersion = "1.18.1" +version '2.0.3-1.18.X' +def nmsVersion = "1.18.2" def apiVersion = '1.18' -def spigotJarVersion = '1.18.1-R0.1-SNAPSHOT' +def spigotJarVersion = '1.18.2-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.1-R0.1-SNAPSHOT' + implementation 'org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT' implementation 'me.clip:placeholderapi:2.11.1' implementation 'io.th0rgal:oraxen:1.94.0' - implementation 'org.bukkit:craftbukkit:1.18.1-R0.1-SNAPSHOT:remapped-mojang' + implementation 'org.bukkit:craftbukkit:1.18.2-R0.1-SNAPSHOT:remapped-mojang' // Shaded implementation 'com.dfsek:Paralithic:0.4.0' diff --git a/src/main/java/com/volmit/iris/core/link/OraxenLink.java b/src/main/java/com/volmit/iris/core/link/OraxenLink.java index 3c3c36eec..0a5c099ab 100644 --- a/src/main/java/com/volmit/iris/core/link/OraxenLink.java +++ b/src/main/java/com/volmit/iris/core/link/OraxenLink.java @@ -62,7 +62,6 @@ public class OraxenLink { } else if(m.getFactory() instanceof BlockMechanicFactory) { MultipleFacing newBlockData = (MultipleFacing) Bukkit.createBlockData(Material.MUSHROOM_STEM); Utils.setBlockFacing(newBlockData, ((BlockMechanic) m).getCustomVariation()); - return newBlockData; } return null; From be99b286b313dde2f5588e8b8ce76491bb3e74a3 Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Thu, 17 Mar 2022 22:43:59 +0100 Subject: [PATCH 08/12] Fixed Brian's mistake. --- build.gradle | 2 +- .../java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a2c5a2636..6ba0f28bc 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins' registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins') registerCustomOutputTask('Coco', 'D://Documents/MC/plugins') registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins') -registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.18.1/plugins') +registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.18.2/plugins') // ========================== UNIX ============================== registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/Documents/development/server/plugins') registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins') 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_2/NMSBinding18_2.java index 7526d3506..dd4a974da 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_2/NMSBinding18_2.java @@ -146,7 +146,7 @@ public class NMSBinding18_2 implements INMSBinding { } private RegistryAccess registry() { - return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer())); + return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer())); } private Registry getCustomBiomeRegistry() { From f9a6bd13431c6626c5fa313b245884331f7ea4a4 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 17 Mar 2022 14:52:40 -0700 Subject: [PATCH 09/12] Readding Oraxen Link for Texting --- src/main/java/com/volmit/iris/core/link/OraxenLink.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/volmit/iris/core/link/OraxenLink.java b/src/main/java/com/volmit/iris/core/link/OraxenLink.java index 0a5c099ab..3c3c36eec 100644 --- a/src/main/java/com/volmit/iris/core/link/OraxenLink.java +++ b/src/main/java/com/volmit/iris/core/link/OraxenLink.java @@ -62,6 +62,7 @@ public class OraxenLink { } else if(m.getFactory() instanceof BlockMechanicFactory) { MultipleFacing newBlockData = (MultipleFacing) Bukkit.createBlockData(Material.MUSHROOM_STEM); Utils.setBlockFacing(newBlockData, ((BlockMechanic) m).getCustomVariation()); + return newBlockData; } return null; From 99713ac964af32740b6561f3cce494fb3946d7f9 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 18 Mar 2022 15:18:35 -0700 Subject: [PATCH 10/12] Need to be version specific now --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6ba0f28bc..49c683eb4 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { } group 'com.volmit.iris' -version '2.0.3-1.18.X' +version '2.0.3-1.18.2' // Needs to be version specific def nmsVersion = "1.18.2" def apiVersion = '1.18' def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT' From 15bc964fcc9b7ab0e878d3147c012cef35c84bfb Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 18 Mar 2022 16:05:38 -0700 Subject: [PATCH 11/12] Ascync tp is disabled for now Ascync TP is done in 1.18 already, and this is just a dirty fix to stop crashing/ lol --- .../framework/EngineAssignedWorldManager.java | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java index b5d457730..4b591fef9 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -69,24 +69,31 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent protected AtomicBoolean ignoreTP = new AtomicBoolean(false); - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void on(PlayerTeleportEvent e) { - if(ignoreTP.get()) { - return; - } - - if(!PaperLib.isPaper() || e.getTo() == null) { - return; - } - - try { - if(e.getTo().getWorld().equals(getTarget().getWorld().realWorld())) { - getEngine().getWorldManager().teleportAsync(e); - } - } catch(Throwable ex) { - - } - } +// @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) +// public void on(PlayerTeleportEvent e) { +// if(ignoreTP.get()) { +// System.out.println("IgTP1"); +// return; +// } +// +// if(!PaperLib.isPaper() || e.getTo() == null) { +// System.out.println("IgTP2"); +// +//// return; +// } +// +//// try { +//// System.out.println("IgTP3"); +//// +//// if(e.getTo().getWorld().equals(getTarget().getWorld().realWorld())) { +//// System.out.println("IgTP4"); +//// +//// getEngine().getWorldManager().teleportAsync(e); +//// } +//// } catch(Throwable ex) { +//// +//// } +// } @EventHandler public void on(WorldSaveEvent e) { From aa4e574eef2717418a686380f5b1b0e2be0cffa1 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sun, 27 Mar 2022 14:42:13 -0400 Subject: [PATCH 12/12] Fix 1.18.2 Biomes --- src/main/java/com/volmit/iris/core/nms/INMSBinding.java | 1 + .../java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java | 4 ++++ src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java | 5 +++++ .../com/volmit/iris/engine/actuator/IrisBiomeActuator.java | 4 ++-- .../volmit/iris/engine/data/chunk/LinkedTerrainChunk.java | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/nms/INMSBinding.java b/src/main/java/com/volmit/iris/core/nms/INMSBinding.java index 0480227f8..031766349 100644 --- a/src/main/java/com/volmit/iris/core/nms/INMSBinding.java +++ b/src/main/java/com/volmit/iris/core/nms/INMSBinding.java @@ -54,6 +54,7 @@ public interface INMSBinding { String getTrueBiomeBaseKey(Location location); Object getCustomBiomeBaseFor(String mckey); + Object getCustomBiomeBaseHolderFor(String mckey); String getKeyForBiomeBase(Object biomeBase); 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_2/NMSBinding18_2.java index dd4a974da..cdc0fd464 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_2/NMSBinding18_2.java @@ -208,6 +208,10 @@ public class NMSBinding18_2 implements INMSBinding { public Object getCustomBiomeBaseFor(String mckey) { return getCustomBiomeRegistry().get(new ResourceLocation(mckey)); } + @Override + public Object getCustomBiomeBaseHolderFor(String mckey) { + return getCustomBiomeRegistry().getHolder(getTrueBiomeBaseId(getCustomBiomeRegistry().get(new ResourceLocation(mckey)))).get(); + } @Override public String getKeyForBiomeBase(Object biomeBase) { diff --git a/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java index cbb8eace5..6db7933ca 100644 --- a/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java +++ b/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java @@ -112,6 +112,11 @@ public class NMSBinding1X implements INMSBinding { return null; } + @Override + public Object getCustomBiomeBaseHolderFor(String mckey) { + return null; + } + @Override public String getKeyForBiomeBase(Object biomeBase) { return null; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java index 1f68544c6..d897178bb 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -57,7 +57,7 @@ public class IrisBiomeActuator extends EngineAssignedActuator { return true; } } catch(Throwable e) { - + e.printStackTrace(); } return false; @@ -79,7 +79,7 @@ public class IrisBiomeActuator extends EngineAssignedActuator { if(ib.isCustom()) { try { IrisBiomeCustom custom = ib.getCustomBiome(rng, x, 0, z); - Object biomeBase = INMS.get().getCustomBiomeBaseFor(getDimension().getLoadKey() + ":" + custom.getId()); + Object biomeBase = INMS.get().getCustomBiomeBaseHolderFor(getDimension().getLoadKey() + ":" + custom.getId()); // if(biomeBase == null || !injectBiome(h, x, 0, z, biomeBase)) { throw new RuntimeException("Cant inject biome!"); diff --git a/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java index 6b672e108..38e9535b4 100644 --- a/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java @@ -18,6 +18,7 @@ package com.volmit.iris.engine.data.chunk; +import com.volmit.iris.Iris; import com.volmit.iris.core.nms.BiomeBaseInjector; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.util.data.IrisBiomeStorage;