From 0832007991dc3d412df8bd2f679a1d8371bb3904 Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Thu, 8 Dec 2022 19:40:13 -0800 Subject: [PATCH] it compiles, not working --- build.gradle | 12 ++++----- src/main/java/com/volmit/iris/Iris.java | 1 - .../java/com/volmit/iris/core/nms/INMS.java | 4 +-- .../{v19_2 => v19_3}/CustomBiomeSource.java | 17 ++++++------ .../NMSBinding19_3.java} | 27 ++++++++++--------- .../volmit/iris/core/service/DolphinSVC.java | 2 +- .../iris/engine/object/IrisDimension.java | 4 +-- .../volmit/iris/engine/object/IrisLoot.java | 2 +- .../engine/platform/BukkitChunkGenerator.java | 4 +-- 9 files changed, 37 insertions(+), 36 deletions(-) rename src/main/java/com/volmit/iris/core/nms/{v19_2 => v19_3}/CustomBiomeSource.java (91%) rename src/main/java/com/volmit/iris/core/nms/{v19_2/NMSBinding19_2.java => v19_3/NMSBinding19_3.java} (95%) diff --git a/build.gradle b/build.gradle index 8fd384a0a..138910718 100644 --- a/build.gradle +++ b/build.gradle @@ -24,11 +24,11 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '2.3.9-1.19.2' // Needs to be version specific -def nmsVersion = "1.19.2" //[NMS] +version '2.3.10-1.19.3' // Needs to be version specific +def nmsVersion = "1.19.3" //[NMS] def apiVersion = '1.19' def specialSourceVersion = '1.11.0' //[NMS] -def spigotJarVersion = '1.19.2-R0.1-SNAPSHOT' //[NMS] +def spigotJarVersion = '1.19.3-R0.1-SNAPSHOT' //[NMS] def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.iris.Iris' @@ -39,7 +39,7 @@ registerCustomOutputTask('Psycho', 'C://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.19.2/plugins') +registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19.3/plugins') // ========================== UNIX ============================== registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins') registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins') @@ -122,10 +122,10 @@ dependencies { // Provided or Classpath compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' - implementation 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT' + implementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' implementation 'me.clip:placeholderapi:2.11.1' implementation 'io.th0rgal:oraxen:1.94.0' - implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang' //[NMS] + implementation 'org.bukkit:craftbukkit:1.19.3-R0.1-SNAPSHOT:remapped-mojang' //[NMS] implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b' // Shaded diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 0c509adce..bf9aee161 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -86,7 +86,6 @@ import java.util.Map; @SuppressWarnings("CanBeFinal") public class Iris extends VolmitPlugin implements Listener { - public static final String OVERWORLD_TAG = "2092"; private static final Queue syncJobs = new ShurikenQueue<>(); 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 21923af86..a573d8918 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.v19_2.NMSBinding19_2; +import com.volmit.iris.core.nms.v19_3.NMSBinding19_3; 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_19_R1", NMSBinding19_2.class); + .qput("v1_19_R2", NMSBinding19_3.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java b/src/main/java/com/volmit/iris/core/nms/v19_3/CustomBiomeSource.java similarity index 91% rename from src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java rename to src/main/java/com/volmit/iris/core/nms/v19_3/CustomBiomeSource.java index a5cf3ccf1..b03d915b3 100644 --- a/src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java +++ b/src/main/java/com/volmit/iris/core/nms/v19_3/CustomBiomeSource.java @@ -1,4 +1,4 @@ -package com.volmit.iris.core.nms.v19_2; +package com.volmit.iris.core.nms.v19_3; import com.mojang.serialization.Codec; import com.volmit.iris.Iris; @@ -11,15 +11,16 @@ import com.volmit.iris.util.math.RNG; import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Climate; import org.bukkit.Bukkit; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -38,13 +39,13 @@ public class CustomBiomeSource extends BiomeSource { public CustomBiomeSource(long seed, Engine engine, World world) { super(getAllBiomes( ((RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer())) - .registry(Registry.BIOME_REGISTRY).orElse(null), - ((CraftWorld) world).getHandle().registryAccess().registry(Registry.BIOME_REGISTRY).orElse(null), + .registry(Registries.BIOME).orElse(null), + ((CraftWorld) world).getHandle().registryAccess().registry(Registries.BIOME).orElse(null), engine)); this.engine = engine; this.seed = seed; - this.biomeCustomRegistry = registry().registry(Registry.BIOME_REGISTRY).orElse(null); - this.biomeRegistry = ((CraftWorld) world).getHandle().registryAccess().registry(Registry.BIOME_REGISTRY).orElse(null); + this.biomeCustomRegistry = registry().registry(Registries.BIOME).orElse(null); + this.biomeRegistry = ((CraftWorld) world).getHandle().registryAccess().registry(Registries.BIOME).orElse(null); this.rng = new RNG(engine.getSeedManager().getBiome()); this.customBiomes = fillCustomBiomes(biomeCustomRegistry, engine); } diff --git a/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java b/src/main/java/com/volmit/iris/core/nms/v19_3/NMSBinding19_3.java similarity index 95% rename from src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java rename to src/main/java/com/volmit/iris/core/nms/v19_3/NMSBinding19_3.java index 23b4b83b5..6c82a500f 100644 --- a/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java +++ b/src/main/java/com/volmit/iris/core/nms/v19_3/NMSBinding19_3.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.core.nms.v19_2; +package com.volmit.iris.core.nms.v19_3; import com.volmit.iris.Iris; @@ -35,6 +35,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.NbtIo; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -45,10 +46,10 @@ import net.minecraft.world.level.chunk.LevelChunk; import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_19_R1.CraftChunk; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_19_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.block.data.CraftBlockData; import org.bukkit.entity.Entity; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; @@ -63,7 +64,7 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -public class NMSBinding19_2 implements INMSBinding { +public class NMSBinding19_3 implements INMSBinding { private final KMap baseBiomeCache = new KMap<>(); private final BlockData AIR = Material.AIR.createBlockData(); @@ -196,11 +197,11 @@ public class NMSBinding19_2 implements INMSBinding { private Registry getCustomBiomeRegistry() { - return registry().registry(Registry.BIOME_REGISTRY).orElse(null); + return registry().registry(Registries.BIOME).orElse(null); } private Registry getBlockRegistry() { - return registry().registry(Registry.BLOCK_REGISTRY).orElse(null); + return registry().registry(Registries.BLOCK).orElse(null); } @Override @@ -254,8 +255,8 @@ public class NMSBinding19_2 implements INMSBinding { @Override public Object getBiomeBase(World world, Biome biome) { - return org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock.biomeToBiomeBase(((CraftWorld) world).getHandle() - .registryAccess().registry(Registry.BIOME_REGISTRY).orElse(null), biome); + return org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock.biomeToBiomeBase(((CraftWorld) world).getHandle() + .registryAccess().registry(Registries.BIOME).orElse(null), biome); } @Override @@ -266,13 +267,13 @@ public class NMSBinding19_2 implements INMSBinding { return v; } //noinspection unchecked - v = org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, biome); + v = org.bukkit.craftbukkit.v1_19_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_19_R1.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); + return org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock.biomeToBiomeBase((Registry) registry, Biome.PLAINS); } baseBiomeCache.put(biome, v); return v; @@ -287,7 +288,7 @@ public class NMSBinding19_2 implements INMSBinding { public int getBiomeId(Biome biome) { for (World i : Bukkit.getWorlds()) { if (i.getEnvironment().equals(World.Environment.NORMAL)) { - Registry registry = ((CraftWorld) i).getHandle().registryAccess().registry(Registry.BIOME_REGISTRY).orElse(null); + Registry registry = ((CraftWorld) i).getHandle().registryAccess().registry(Registries.BIOME).orElse(null); return registry.getId((net.minecraft.world.level.biome.Biome) getBiomeBase(registry, biome)); } } diff --git a/src/main/java/com/volmit/iris/core/service/DolphinSVC.java b/src/main/java/com/volmit/iris/core/service/DolphinSVC.java index e1a853c73..c841ef95a 100644 --- a/src/main/java/com/volmit/iris/core/service/DolphinSVC.java +++ b/src/main/java/com/volmit/iris/core/service/DolphinSVC.java @@ -29,7 +29,7 @@ import net.minecraft.core.BlockPos; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.SoundCategory; -import org.bukkit.craftbukkit.v1_19_R1.entity.CraftDolphin; +import org.bukkit.craftbukkit.v1_19_R2.entity.CraftDolphin; import org.bukkit.entity.Dolphin; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index a66aa9f0c..61f4ffc93 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -62,10 +62,10 @@ public class IrisDimension extends IrisRegistrant { "ambient_light": 0, "piglin_safe": false, "bed_works": true, - "respawn_anchor_works": false, + "respawn_anchor_works": true, "has_raids": true, "monster_spawn_block_light_limit": 7, - "monster_spawn_light_level": 1, + "monster_spawn_light_level": 7, "infiniburn": "#minecraft:infiniburn_overworld", "effects": "minecraft:overworld" }"""; 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 15334e603..868ffec2f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -40,7 +40,7 @@ import net.minecraft.nbt.TagParser; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; diff --git a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java index d83f3bb2e..07032d1d7 100644 --- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.platform; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.core.nms.v19_2.CustomBiomeSource; +import com.volmit.iris.core.nms.v19_3.CustomBiomeSource; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.engine.IrisEngine; import com.volmit.iris.engine.data.chunk.TerrainChunk; @@ -46,7 +46,7 @@ import net.minecraft.server.level.ServerLevel; import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler;