v1.220.0

gradle.properties

@@ -1 +1 @@
-pluginVersion=1.219.0
+pluginVersion=1.220.0

nms/java21/src/main/java/io/th0rgal/oraxen/nms/handler/java21/NMSHandler.java

@@ -33,7 +33,6 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.PositionMoveRotation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvent;
@@ -49,6 +48,7 @@
 import net.minecraft.world.item.JukeboxSong;
 import net.minecraft.world.item.component.Consumable;
 import net.minecraft.world.item.component.CustomData;
+import net.minecraft.world.item.component.DeathProtection;
 import net.minecraft.world.item.consume_effects.*;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.item.context.DirectionalPlaceContext;
@@ -71,10 +71,9 @@
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.components.FoodComponent;
-import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
@@ -83,7 +82,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class NMSHandler implements io.th0rgal.oraxen.nms.NMSHandler {
 
@@ -249,11 +247,6 @@ public BlockHitResult getPlayerPOVHitResult(Level world, net.minecraft.world.ent
         return world.clip(new ClipContext(vec3, vec32, ClipContext.Block.OUTLINE, fluidHandling, player));
     }
 
-    @Override
-    public void customBlockDefaultTools(Player player) {
-
-    }
-
     private TagNetworkSerialization.NetworkPayload createPayload() {
         Constructor<?> constructor = Arrays
                 .stream(TagNetworkSerialization.NetworkPayload.class.getDeclaredConstructors()).findFirst()
@@ -288,11 +281,6 @@ private Map<Object, IntList> createTagRegistryMap() {
         }).collect(HashMap::new, Map::putAll, Map::putAll);
     }
 
-    @Override
-    public boolean getSupported() {
-        return true;
-    }
-
     /**
      * Sets a component on an item using the DataComponents registry
      * 
@@ -449,24 +437,6 @@ private void handleListValue(net.minecraft.nbt.CompoundTag nbt, String key, List
         }
     }
 
-    @SuppressWarnings("UnstableApiUsage")
-    @Override
-    public void foodComponent(ItemBuilder item, ConfigurationSection foodSection) {
-        FoodComponent foodComponent = new ItemStack(item.getType()).getItemMeta().getFood();
-
-        // Ensure nutrition is non-negative
-        int nutrition = Math.max(foodSection.getInt("nutrition"), 0);
-        foodComponent.setNutrition(nutrition);
-
-        // Ensure saturation is non-negative
-        float saturation = Math.max((float) foodSection.getDouble("saturation", 0.0), 0f);
-        foodComponent.setSaturation(saturation);
-
-        foodComponent.setCanAlwaysEat(foodSection.getBoolean("can_always_eat", false));
-
-        item.setFoodComponent(foodComponent);
-    }
-
     @SuppressWarnings("UnstableApiUsage")
     @Override
     public void consumableComponent(ItemBuilder item, ConfigurationSection section) {
@@ -522,6 +492,105 @@ public void consumableComponent(ItemBuilder item, ConfigurationSection section)
         item.setConsumableComponent(consumable.build());
     }
 
+    @Override
+    public void deathProtectionComponent(ItemBuilder item, ConfigurationSection section) {
+        List<ConsumeEffect> effects = parseDeathProtectionEffects(section.getMapList("death_effects"));
+        item.setDeathProtectionComponent(new DeathProtection(effects));
+    }
+
+    private List<ConsumeEffect> parseDeathProtectionEffects(List<Map<?, ?>> effectSections) {
+        List<ConsumeEffect> effects = new ArrayList<>();
+
+        for (Map<?, ?> effectSection : effectSections) {
+            String type = Optional.ofNullable(effectSection.get("type"))
+                    .map(Object::toString)
+                    .orElse("");
+
+            switch (type.toLowerCase(Locale.ROOT)) {
+                case "apply_effects" -> addDeathProtectionStatusEffects(effects, effectSection);
+                case "remove_effects" -> addDeathProtectionRemoveEffects(effects, effectSection);
+                case "clear_all_effects" -> effects.add(new ClearAllStatusEffectsConsumeEffect());
+                case "teleport_randomly" -> {
+                    float diameter = parseFloatValue(effectSection.get("diameter"), 16f,
+                            "death_protection.teleport_randomly.diameter");
+                    effects.add(new TeleportRandomlyConsumeEffect(diameter));
+                }
+                case "play_sound" -> {
+                    String soundId = Optional.ofNullable(effectSection.get("sound"))
+                            .map(Object::toString)
+                            .orElse(null);
+                    if (soundId != null) {
+                        SoundEvent soundEvent = getSoundEventFromId(soundId);
+                        if (soundEvent != null)
+                            effects.add(new PlaySoundConsumeEffect(Holder.direct(soundEvent)));
+                    }
+                }
+                default -> Logs.logWarning("Invalid death_protection ConsumeEffect-Type " + type);
+            }
+        }
+
+        return effects;
+    }
+
+    private void addDeathProtectionStatusEffects(List<ConsumeEffect> effects, Map<?, ?> effectSection) {
+        if (!(effectSection.get("effects") instanceof Map<?, ?> configuredEffects))
+            return;
+
+        float probability = Math.max(0f, Math.min(1f,
+                parseFloatValue(effectSection.get("probability"), 1f, "death_protection.probability")));
+        List<MobEffectInstance> statusEffects = new ArrayList<>();
+
+        for (Map.Entry<?, ?> entry : configuredEffects.entrySet()) {
+            String effectId = entry.getKey().toString();
+            if (!(entry.getValue() instanceof Map<?, ?> rawMap)) {
+                Logs.logWarning("Invalid death_protection effect data for " + effectId + ": expected map");
+                continue;
+            }
+
+            Map<String, Object> effectData = new HashMap<>();
+            for (Map.Entry<?, ?> effectEntry : rawMap.entrySet())
+                effectData.put(String.valueOf(effectEntry.getKey()), effectEntry.getValue());
+
+            getMobEffectOptional(effectId)
+                    .map(BuiltInRegistries.MOB_EFFECT::wrapAsHolder)
+                    .ifPresentOrElse(effect -> {
+                        int duration = Math.max(parseIntegerValue(effectData.get("duration"), 1, "duration", effectId), 0) * 20;
+                        int amplifier = Math.max(parseIntegerValue(effectData.get("amplifier"), 0, "amplifier", effectId), 0);
+                        boolean ambient = Optional.ofNullable(effectData.get("ambient"))
+                                .map(value -> Boolean.parseBoolean(value.toString()))
+                                .orElse(false);
+                        boolean particles = Optional.ofNullable(effectData.get("show_particles"))
+                                .map(value -> Boolean.parseBoolean(value.toString()))
+                                .orElse(true);
+                        boolean icon = Optional.ofNullable(effectData.get("show_icon"))
+                                .map(value -> Boolean.parseBoolean(value.toString()))
+                                .orElse(true);
+
+                        statusEffects.add(new MobEffectInstance(
+                                effect, duration, amplifier, ambient, particles, icon));
+                    }, () -> Logs.logWarning("Invalid potion effect in death_protection: " + effectId));
+        }
+
+        if (!statusEffects.isEmpty())
+            effects.add(new ApplyStatusEffectsConsumeEffect(statusEffects, probability));
+    }
+
+    private void addDeathProtectionRemoveEffects(List<ConsumeEffect> effects, Map<?, ?> effectSection) {
+        if (!(effectSection.get("effects") instanceof List<?> effectIds))
+            return;
+
+        List<Holder<MobEffect>> mobEffects = effectIds.stream()
+                .map(Object::toString)
+                .map(this::getMobEffectOptional)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(BuiltInRegistries.MOB_EFFECT::wrapAsHolder)
+                .toList();
+
+        if (!mobEffects.isEmpty())
+            effects.add(new RemoveStatusEffectsConsumeEffect(HolderSet.direct(mobEffects)));
+    }
+
     private void handleApplyEffects(Consumable.Builder consumable, Map<?, ?> effectSection) {
         if (!(effectSection.get("effects") instanceof Map<?, ?> effects))
             return;
@@ -711,6 +780,20 @@ public Object consumableComponent(final ItemStack itemStack) {
         return null;
     }
 
+    @Override
+    @Nullable
+    public Object deathProtectionComponent(final ItemStack itemStack) {
+        if (itemStack == null)
+            return null;
+        try {
+            net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(itemStack);
+            return nmsItem.get(DataComponents.DEATH_PROTECTION);
+        } catch (Exception e) {
+            Logs.debug(e);
+        }
+        return null;
+    }
+
     @Override
     public ItemStack consumableComponent(final ItemStack itemStack, @Nullable Object consumable) {
         if (consumable == null)
@@ -725,6 +808,20 @@ public ItemStack consumableComponent(final ItemStack itemStack, @Nullable Object
         return itemStack;
     }
 
+    @Override
+    public ItemStack deathProtectionComponent(final ItemStack itemStack, @Nullable Object deathProtection) {
+        if (!(deathProtection instanceof DeathProtection component))
+            return itemStack;
+        try {
+            net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(itemStack);
+            nmsItem.set(DataComponents.DEATH_PROTECTION, component);
+            return asBukkitCopy(nmsItem);
+        } catch (Exception e) {
+            Logs.debug(e);
+        }
+        return itemStack;
+    }
+
     @Override
     public boolean supportsJukeboxPlaying() {
         return true;
@@ -743,23 +840,8 @@ public void playJukeBoxSong(Location location, ItemStack itemStack) {
                 new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()), id);
     }
 
-    @Override
-    public void stopJukeBox(Location location) {
-        if (location == null || location.getWorld() == null) return;
-        ServerLevel level = ((CraftWorld) location.getWorld()).getHandle().getLevel();
-        level.levelEvent(null, LevelEvent.SOUND_STOP_JUKEBOX_SONG,
-                new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()), 0);
-    }
-
     // ============ Backpack Cosmetic Packet Methods ============
 
-    private static final AtomicInteger ENTITY_ID_COUNTER = new AtomicInteger(Integer.MAX_VALUE / 2);
-
-    @Override
-    public int getNextEntityId() {
-        return ENTITY_ID_COUNTER.decrementAndGet();
-    }
-
     private static EntityType<?> getEntityType(String entityId) {
         try {
             Object location = ResourceLocationHelper.parse(entityId);
@@ -837,27 +919,6 @@ public void spawnBackpackArmorStand(Player viewer, int entityId, Location locati
         }
     }
 
-    @Override
-    public void sendEntityTeleport(Player viewer, int entityId, Location location) {
-        ServerPlayer serverPlayer = ((CraftPlayer) viewer).getHandle();
-        Connection connection = serverPlayer.connection.connection;
-
-        // Create position/rotation data
-        PositionMoveRotation positionData = new PositionMoveRotation(
-                new Vec3(location.getX(), location.getY(), location.getZ()),
-                Vec3.ZERO, // delta movement
-                location.getYaw(),
-                location.getPitch()
-        );
-
-        ClientboundEntityPositionSyncPacket teleportPacket = new ClientboundEntityPositionSyncPacket(
-                entityId,
-                positionData,
-                false // on ground
-        );
-        connection.send(teleportPacket);
-    }
-
     @Override
     public void sendEntityHeadRotation(Player viewer, int entityId, float yaw) {
         ServerPlayer serverPlayer = ((CraftPlayer) viewer).getHandle();