Initial 1.18.2 build

README.md

@@ -3,7 +3,7 @@ The Denizen Scripting Language - Spigot Impl
 
 An implementation of the Denizen Scripting Language for Spigot servers, with strong Citizens interlinks to emphasize the power of using Denizen with NPCs!
 
-**Version 1.2.4**: Compatible with Spigot 1.16.5, 1.17.1, and 1.18.1!
+**Version 1.2.4**: Compatible with Spigot 1.16.5, 1.17.1, and 1.18.2!
 
 **Learn about Denizen from the Beginner's guide:** https://guide.denizenscript.com/guides/background/index.html
 

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <craftbukkit.version>1.18.1-R0.1-SNAPSHOT</craftbukkit.version>
+        <craftbukkit.version>1.18.2-R0.1-SNAPSHOT</craftbukkit.version>
         <citizens.version>2.0.29-SNAPSHOT</citizens.version>
         <dcore.version>1.90-SNAPSHOT</dcore.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>

v1_18/pom.xml

@@ -22,13 +22,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.18.1-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.18.1-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
@@ -48,9 +48,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.18.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:1.18.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -63,8 +63,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.18.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:1.18.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/Handler.java

@@ -28,6 +28,7 @@
 import net.md_5.bungee.api.chat.hover.content.Item;
 import net.md_5.bungee.api.chat.hover.content.Text;
 import net.md_5.bungee.chat.ComponentSerializer;
+import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.ByteArrayTag;
 import net.minecraft.nbt.StringTag;
@@ -47,15 +48,15 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftInventory;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_18_R1.persistence.CraftPersistentDataContainer;
-import org.bukkit.craftbukkit.v1_18_R1.util.CraftChatMessage;
-import org.bukkit.craftbukkit.v1_18_R1.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.persistence.CraftPersistentDataContainer;
+import org.bukkit.craftbukkit.v1_18_R2.util.CraftChatMessage;
+import org.bukkit.craftbukkit.v1_18_R2.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.persistence.PersistentDataContainer;
@@ -104,7 +105,7 @@ public void undisableAsyncCatcher() {
 
     @Override
     public boolean isCorrectMappingsCode() {
-        return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("20b026e774dbf715e40a0b2afe114792");
+        return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("eaeedbff51b16ead3170906872fda334");
     }
 
     @Override
@@ -272,8 +273,8 @@ public BiomeNMS getBiomeNMS(World world, String name) {
     public BiomeNMS getBiomeAt(Block block) {
         // Based on CraftWorld source
         ServerLevel level = ((CraftWorld) block.getWorld()).getHandle();
-        Biome biome = level.getNoiseBiome(block.getX() >> 2, block.getY() >> 2, block.getZ() >> 2);
-        ResourceLocation key = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).getKey(biome);
+        Holder<Biome> biome = level.getNoiseBiome(block.getX() >> 2, block.getY() >> 2, block.getZ() >> 2);
+        ResourceLocation key = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).getKey(biome.value());
         String keyText = key.getNamespace().equals("minecraft") ? key.getPath() : key.toString();
         return new BiomeNMSImpl(level, keyText);
     }

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/ReflectionMappingsInfo.java

@@ -2,14 +2,14 @@
 
 public class ReflectionMappingsInfo {
 
-    // Contents gathered via https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.18.1
+    // Contents gathered via https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.18.2
 
     // net.minecraft.advancements.AdvancementList
     public static String AdvancementList_roots = "c";
     public static String AdvancementList_tasks = "d";
 
     // net.minecraft.world.level.block.state.BlockBehaviour
-    public static String BlockBehaviour_explosionResistance = "aI";
+    public static String BlockBehaviour_explosionResistance = "aH";
 
     // net.minecraft.stats.RecipeBook
     public static String RecipeBook_known = "a";
@@ -18,32 +18,34 @@ public class ReflectionMappingsInfo {
     public static String RecipeManager_byName = "d";
 
     // net.minecraft.world.entity.Entity
-    public static String Entity_onGround = "z";
-    public static String Entity_DATA_SHARED_FLAGS_ID = "aa";
-    public static String Entity_DATA_CUSTOM_NAME = "aL";
-    public static String Entity_DATA_CUSTOM_NAME_VISIBLE = "aM";
+    public static String Entity_onGround = "y";
+    public static String Entity_DATA_SHARED_FLAGS_ID = "Z";
+    public static String Entity_DATA_CUSTOM_NAME = "aM";
+    public static String Entity_DATA_CUSTOM_NAME_VISIBLE = "aN";
 
     // net.minecraft.world.entity.LivingEntity
-    public static String LivingEntity_attackStrengthTicker = "aR";
+    public static String LivingEntity_attackStrengthTicker = "aQ";
+    public static String LivingEntity_autoSpinAttackTicks = "bC";
+    public static String LivingEntity_setLivingEntityFlag = "c";
 
     // net.minecraft.world.entity.player.Player
     public static String Player_DATA_PLAYER_ABSORPTION_ID = "d";
-    public static String Player_DATA_PLAYER_MODE_CUSTOMISATION = "bQ";
+    public static String Player_DATA_PLAYER_MODE_CUSTOMISATION = "bP";
 
     // net.minecraft.server.level.ServerPlayer
-    public static String ServerPlayer_respawnForced = "cV";
+    public static String ServerPlayer_respawnForced = "cU";
 
     // net.minecraft.world.entity.monster.EnderMan
-    public static String EnderMan_DATA_CREEPY = "bY";
+    public static String EnderMan_DATA_CREEPY = "bX";
 
     // net.minecraft.world.entity.monster.Zombie
-    public static String Zombie_inWaterTime = "cf";
+    public static String Zombie_inWaterTime = "ce";
 
     // net.minecraft.world.item.Item
-    public static String Item_maxStackSize = "c";
+    public static String Item_maxStackSize = "d";
 
     // net.minecraft.world.level.Level
-    public static String Level_isClientSide = "y";
+    public static String Level_isClientSide = "x";
 
     // net.minecraft.server.level.ThreadedLevelLightEngine
     public static String ThreadedLevelLightEngine_addTask = "a";
@@ -54,7 +56,7 @@ public class ReflectionMappingsInfo {
     public static String ItemEntity_DATA_ITEM = "c";
 
     // net.minecraft.world.level.biome.Biome
-    public static String Biome_climateSettings = "k";
+    public static String Biome_climateSettings = "i";
     // net.minecraft.world.level.biome.Biome$ClimateSettings
     public static String Biome_ClimateSettings_temperature = "c";
     public static String Biome_ClimateSettings_downfall = "e";
@@ -97,12 +99,21 @@ public class ReflectionMappingsInfo {
     public static String ClientboundTeleportEntityPacket_yRot = "e";
     public static String ClientboundTeleportEntityPacket_xRot = "f";
 
-    // net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData
+    // net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData$BlockEntityInfo
     public static String ClientboundLevelChunkPacketData_BlockEntityInfo_packedXZ = "a";
     public static String ClientboundLevelChunkPacketData_BlockEntityInfo_y = "b";
 
     // net.minecraft.world.entity.projectile.FishingHook
     public static String FishingHook_nibble = "ar";
     public static String FishingHook_timeUntilLured = "as";
     public static String FishingHook_timeUntilHooked = "at";
+
+    // net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase
+    public static String BlockBehaviour_BlockStateBase_getFluidState = "o";
+
+    // net.minecraft.world.level.material.FluidState
+    public static String FluidState_isRandomlyTicking = "f";
+    public static String FluidState_isEmpty = "c";
+    public static String FluidState_createLegacyBlock = "g";
+    public static String FluidState_animateTick = "a";
 }

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/AdvancementHelperImpl.java

@@ -16,9 +16,9 @@
 import net.minecraft.server.level.ServerPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Field;

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/AnimationHelperImpl.java

@@ -2,10 +2,10 @@
 
 import com.denizenscript.denizen.nms.abstracts.AnimationHelper;
 import net.minecraft.world.entity.Entity;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftHorse;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPolarBear;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftSkeleton;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftHorse;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPolarBear;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftSkeleton;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.IronGolem;

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/BlockHelperImpl.java

@@ -35,12 +35,12 @@
 import org.bukkit.Material;
 import org.bukkit.block.*;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_18_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.block.*;
-import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_18_R1.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_18_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.block.*;
+import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.util.CraftMagicNumbers;
 import org.bukkit.event.world.PortalCreateEvent;
 
 import java.lang.invoke.MethodHandle;
@@ -233,11 +233,11 @@ public void setBlockStrength(Material mat, float strength) {
     // This is to debork Spigot's class remapper mishandling 'getFluidState' which remaps 'FluidState' to 'material.FluidType' (incorrectly) in the call and thus errors out.
     // TODO: 1.18: This might be fixed by Spigot and can be switched to raw method calls
     // Relevant issue: https://hub.spigotmc.org/jira/browse/SPIGOT-6696
-    public static MethodHandle BLOCKSTATEBASE_GETFLUIDSTATE = ReflectionHelper.getMethodHandle(BlockBehaviour.BlockStateBase.class, "n");
-    public static MethodHandle FLUIDSTATE_ISRANDOMLYTICKING = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), "f");
-    public static MethodHandle FLUIDSTATE_ISEMPTY = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), "c");
-    public static MethodHandle FLUIDSTATE_CREATELEGACYBLOCK = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), "g");
-    public static MethodHandle FLUIDSTATE_ANIMATETICK = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), "a", Level.class, BlockPos.class, Random.class);
+    public static MethodHandle BLOCKSTATEBASE_GETFLUIDSTATE = ReflectionHelper.getMethodHandle(BlockBehaviour.BlockStateBase.class, ReflectionMappingsInfo.BlockBehaviour_BlockStateBase_getFluidState);
+    public static MethodHandle FLUIDSTATE_ISRANDOMLYTICKING = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), ReflectionMappingsInfo.FluidState_isRandomlyTicking);
+    public static MethodHandle FLUIDSTATE_ISEMPTY = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), ReflectionMappingsInfo.FluidState_isEmpty);
+    public static MethodHandle FLUIDSTATE_CREATELEGACYBLOCK = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), ReflectionMappingsInfo.FluidState_createLegacyBlock);
+    public static MethodHandle FLUIDSTATE_ANIMATETICK = ReflectionHelper.getMethodHandle(BLOCKSTATEBASE_GETFLUIDSTATE.type().returnType(), ReflectionMappingsInfo.FluidState_animateTick, Level.class, BlockPos.class, Random.class);
 
     @Override
     public void doRandomTick(Location location) {

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/ChunkHelperImpl.java

@@ -6,6 +6,7 @@
 import com.denizenscript.denizen.nms.interfaces.ChunkHelper;
 import com.denizenscript.denizencore.utilities.ReflectionHelper;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
+import net.minecraft.core.Holder;
 import net.minecraft.core.QuartPos;
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
@@ -18,8 +19,8 @@
 import net.minecraft.world.level.levelgen.Heightmap;
 import org.bukkit.World;
 import org.bukkit.Chunk;
-import org.bukkit.craftbukkit.v1_18_R1.CraftChunk;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Field;
@@ -94,15 +95,15 @@ public int[] getHeightMap(Chunk chunk) {
 
     @Override
     public void setAllBiomes(Chunk chunk, BiomeNMS biome) {
-        Biome nmsBiome = ((BiomeNMSImpl) biome).biomeBase;
+        Holder<Biome> nmsBiome = ((BiomeNMSImpl) biome).biomeBase;
         LevelChunk nmsChunk = ((CraftChunk) chunk).getHandle();
         ChunkPos chunkcoordintpair = nmsChunk.getPos();
         int i = QuartPos.fromBlock(chunkcoordintpair.getMinBlockX());
         int j = QuartPos.fromBlock(chunkcoordintpair.getMinBlockZ());
         LevelHeightAccessor levelheightaccessor = nmsChunk.getHeightAccessorForGeneration();
         for(int k = levelheightaccessor.getMinSection(); k < levelheightaccessor.getMaxSection(); ++k) {
             LevelChunkSection chunksection = nmsChunk.getSection(nmsChunk.getSectionIndexFromSectionY(k));
-            PalettedContainer<Biome> datapaletteblock = chunksection.getBiomes();
+            PalettedContainer<Holder<Biome>> datapaletteblock = chunksection.getBiomes();
             datapaletteblock.acquire();
             for(int l = 0; l < 4; ++l) {
                 for(int i1 = 0; i1 < 4; ++i1) {

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/CustomEntityHelperImpl.java

@@ -17,8 +17,8 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.Scoreboard;

v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EnchantmentHelperImpl.java

@@ -17,10 +17,10 @@
 import net.minecraft.world.entity.MobType;
 import net.minecraft.world.item.enchantment.EnchantmentCategory;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_18_R1.enchantments.CraftEnchantment;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_18_R1.util.CraftNamespacedKey;
+import org.bukkit.craftbukkit.v1_18_R2.enchantments.CraftEnchantment;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.util.CraftNamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.event.entity.EntityDamageEvent;