misc: 1.20.4

gradle.properties

@@ -1,15 +1,15 @@
-project_version=0.13.5
+project_version=0.14.0
 
 # FM Protocols
 protocols_version=09b2b0a077
 protocols_use_local_build=false
 protocols_local_version=0.13.2
 
-minecraft_version=1.20.2-R0.1-SNAPSHOT
+minecraft_version=1.20.4-R0.1-SNAPSHOT
 
 # Dependencies
 ld_version=10.0.33
 pluginbase_version=306d580
-gsit_version=1.4.1
-papi_version=2.11.3
-bstats_version=3.0.1
+gsit_version=1.6.0
+papi_version=2.11.5
+bstats_version=3.0.2

src/main/java/xiamomc/morph/abilities/impl/FlyAbility.java

@@ -6,7 +6,7 @@
 import org.bukkit.GameEvent;
 import org.bukkit.GameMode;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;

src/main/java/xiamomc/morph/abilities/impl/HealsFromEntityAbility.java

@@ -7,7 +7,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;

src/main/java/xiamomc/morph/abilities/impl/onAttack/ExtraKnockbackAbility.java

@@ -3,7 +3,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import xiamomc.morph.MorphManager;

src/main/java/xiamomc/morph/events/RevealingEventProcessor.java

@@ -1,6 +1,6 @@
 package xiamomc.morph.events;
 
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftMob;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMob;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

src/main/java/xiamomc/morph/misc/BlockDestroyHandler.java

@@ -4,9 +4,9 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/xiamomc/morph/misc/NilCommandSource.java

@@ -1,7 +1,7 @@
 package xiamomc.morph.misc;
 
 import net.kyori.adventure.text.Component;
-import org.bukkit.craftbukkit.v1_20_R2.command.ServerCommandSender;
+import org.bukkit.craftbukkit.v1_20_R3.command.ServerCommandSender;
 import org.jetbrains.annotations.NotNull;
 
 public final class NilCommandSource extends ServerCommandSender

src/main/java/xiamomc/morph/misc/NmsRecord.java

@@ -3,9 +3,9 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;

src/main/java/xiamomc/morph/misc/PlayerOperationSimulator.java

@@ -10,9 +10,9 @@
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.GameMode;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_20_R2.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;

src/main/java/xiamomc/morph/providers/DisguiseProvider.java

@@ -3,7 +3,7 @@
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.kyori.adventure.text.Component;
 import net.minecraft.nbt.CompoundTag;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

src/main/java/xiamomc/morph/providers/VanillaDisguiseProvider.java

@@ -26,10 +26,7 @@
 import xiamomc.morph.misc.DisguiseState;
 import xiamomc.morph.misc.DisguiseTypes;
 import xiamomc.morph.misc.NmsRecord;
-import xiamomc.morph.utilities.EntityTargetingHelper;
-import xiamomc.morph.utilities.EntityTypeUtils;
-import xiamomc.morph.utilities.NbtUtils;
-import xiamomc.morph.utilities.ReflectionUtils;
+import xiamomc.morph.utilities.*;
 import xiamomc.pluginbase.Annotations.Initializer;
 import xiamomc.pluginbase.Annotations.Resolved;
 import xiamomc.pluginbase.Bindables.Bindable;
@@ -216,7 +213,7 @@ public void postConstructDisguise(DisguiseState state, @Nullable Entity targetEn
             var entityClazz = state.getEntityType().getEntityClass();
             if (entityClazz != null)
             {
-                var entity = state.getPlayer().getWorld().spawn(loc, entityClazz, CreatureSpawnEvent.SpawnReason.CUSTOM);
+                var entity = NmsUtils.spawnEntity(state.getEntityType(), state.getPlayer().getWorld(), loc);
 
                 if (entity instanceof LivingEntity living)
                 {

src/main/java/xiamomc/morph/skills/impl/ExplodeMorphSkill.java

@@ -5,8 +5,8 @@
 import org.bukkit.GameMode;
 import org.bukkit.GameRule;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

src/main/java/xiamomc/morph/skills/impl/SonicBoomMorphSkill.java

@@ -6,7 +6,7 @@
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Particle;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import xiamomc.morph.misc.DisguiseState;

src/main/java/xiamomc/morph/updates/UpdateHandler.java

@@ -11,7 +11,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.craftbukkit.v1_20_R2.command.ServerCommandSender;
+import org.bukkit.craftbukkit.v1_20_R3.command.ServerCommandSender;
 import org.jetbrains.annotations.Nullable;
 import xiamomc.morph.MorphPlugin;
 import xiamomc.morph.MorphPluginObject;

src/main/java/xiamomc/morph/utilities/EntityTargetingHelper.java

@@ -9,7 +9,7 @@
 import net.minecraft.world.entity.ai.goal.WrappedGoal;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.world.entity.player.Player;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftMob;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftMob;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Mob;

src/main/java/xiamomc/morph/utilities/EntityTypeUtils.java

@@ -13,8 +13,8 @@
 import net.minecraft.world.entity.player.Player;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Enemy;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.NotNull;

src/main/java/xiamomc/morph/utilities/ItemUtils.java

@@ -4,7 +4,7 @@
 import com.google.gson.GsonBuilder;
 import com.mojang.serialization.JsonOps;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/xiamomc/morph/utilities/MapMetaUtils.java

@@ -1,7 +1,7 @@
 package xiamomc.morph.utilities;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.slf4j.ILoggerFactory;

src/main/java/xiamomc/morph/utilities/NbtUtils.java

@@ -4,7 +4,7 @@
 import net.minecraft.nbt.StringTagVisitor;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.server.commands.data.EntityDataAccessor;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.Contract;

src/main/java/xiamomc/morph/utilities/NmsUtils.java

@@ -0,0 +1,29 @@
+package xiamomc.morph.utilities;
+
+import net.minecraft.world.phys.Vec3;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+
+public class NmsUtils
+{
+    public static Entity spawnEntity(EntityType bukkitType, World targetWorld, Location location)
+    {
+        var nmsType = EntityTypeUtils.getNmsType(bukkitType);
+
+        if (nmsType == null)
+            throw new IllegalArgumentException("No NMS EntityType for bukkit type '%s'".formatted(bukkitType));
+
+        var nmsWorld = ((CraftWorld) targetWorld).getHandle();
+        var nmsEntity = nmsType.create(nmsWorld);
+
+        if (nmsEntity == null)
+            throw new IllegalArgumentException("Unable to spawn entity");
+
+        nmsEntity.setPos(new Vec3(location.x(), location.y(), location.z()));
+
+        return nmsEntity.getBukkitEntity();
+    }
+}