(upgrade) to mc 1.19.4

Author: Lori3f6

build.gradle

@@ -14,7 +14,7 @@ ext.pluginNameLower = ext.pluginNameUpper.toLowerCase()
 
 ext.majorVersion = 9
 ext.minorVersion = 2
-ext.minecraftVersion = "1.19.2"
+ext.minecraftVersion = "1.19.4"
 
 
 // Supplied by Jenkins

src/main/java/cat/nyaa/nyaacore/utils/EntityUtils.java

@@ -12,23 +12,10 @@
 public class EntityUtils {
     public static AtomicInteger FAKE_ENTITY_COUNTER = new AtomicInteger(0xffcc);
 
-    public static int getNewEntityId() {
-        try {
-            Field ENTITY_COUNTER = Entity.class.getDeclaredField("ENTITY_COUNTER");
-            return ((AtomicInteger) ENTITY_COUNTER.get(null)).incrementAndGet();
-        } catch (IllegalAccessException | NoSuchFieldException ignored) {
-        }
-        return -FAKE_ENTITY_COUNTER.incrementAndGet();
-    }
-
     private static Optional<EntityType<?>> getNmsEntityTypes(org.bukkit.entity.EntityType bukkitEntityType) {
         return EntityType.byString(bukkitEntityType.getKey().getKey());
     }
 
-    public static Optional<Integer> getEntityTypeId(org.bukkit.entity.EntityType bukkitEntityType) {
-        return getNmsEntityTypes(bukkitEntityType).map(Registry.ENTITY_TYPE::getId);
-    }
-
     public static int getUpdateInterval(org.bukkit.entity.EntityType bukkitEntityType) {
         return getNmsEntityTypes(bukkitEntityType).map(EntityType::updateInterval).orElse(3);
     }

src/main/java/cat/nyaa/nyaacore/utils/ItemStackUtils.java

@@ -14,7 +14,7 @@
 import net.minecraft.util.datafix.DataFixers;
 import net.minecraft.util.datafix.fixes.References;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
 import java.io.*;

src/main/java/cat/nyaa/nyaacore/utils/ItemTagUtils.java

@@ -1,7 +1,7 @@
 package cat.nyaa.nyaacore.utils;
 
 import net.minecraft.nbt.CompoundTag;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
 import java.lang.reflect.Field;

src/main/java/cat/nyaa/nyaacore/utils/LocaleUtils.java

@@ -5,7 +5,7 @@
 import net.md_5.bungee.api.chat.TranslatableComponent;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;

src/main/java/cat/nyaa/nyaacore/utils/NmsUtils.java

@@ -5,15 +5,20 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.TagParser;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.world.damagesource.DamageTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Explosion;
+import net.minecraft.world.level.ExplosionDamageCalculator;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 
@@ -58,7 +63,7 @@ public static void setEntityTag(Entity e, String tag) {
     }
 
     public static boolean createExplosion(World world, Entity entity, double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
-        return !((CraftWorld) world).getHandle().explode(((CraftEntity) entity).getHandle(), x, y, z, power, setFire, breakBlocks ? Explosion.BlockInteraction.BREAK : Explosion.BlockInteraction.NONE).wasCanceled;
+        return !((CraftWorld) world).getHandle().explode(((CraftEntity) entity).getHandle(), x, y, z, power, setFire, breakBlocks ? Level.ExplosionInteraction.MOB : Level.ExplosionInteraction.NONE).wasCanceled;
     }
 
     /**

src/main/java/cat/nyaa/nyaacore/utils/RayTraceUtils.java

@@ -4,7 +4,7 @@
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

src/main/java/cat/nyaa/nyaacore/utils/RegistryUtils.java

@@ -1,7 +1,7 @@
 package cat.nyaa.nyaacore.utils;
 
 import net.minecraft.world.entity.projectile.ThrownTrident;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
 import org.bukkit.entity.Trident;
 import org.bukkit.inventory.ItemStack;