PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ItemStackBuilder: make canPlaceOn and canBreak actually working (must use old deprecated API because the new API is not yet working)

Browse Source
This commit is contained in:
Marc Baloup 2025-01-18 19:17:33 +01:00
parent 49942b35da
commit c229b14779
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pandalib-paper/src/main/java/fr/pandacube/lib/paper/inventory/ItemStackBuilder.java
View File

@ -2,14 +2,12 @@ package fr.pandacube.lib.paper.inventory;
import com.google.common.collect.Streams; import com.google.common.collect.Streams;
import fr.pandacube.lib.chat.Chat; import fr.pandacube.lib.chat.Chat;
import io.papermc.paper.block.BlockPredicate;
import io.papermc.paper.datacomponent.DataComponentType; import io.papermc.paper.datacomponent.DataComponentType;
import io.papermc.paper.datacomponent.DataComponentType.Valued; import io.papermc.paper.datacomponent.DataComponentType.Valued;
import io.papermc.paper.datacomponent.DataComponentTypes;
import io.papermc.paper.datacomponent.item.ItemAdventurePredicate;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.ComponentLike;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -17,6 +15,7 @@ import org.bukkit.inventory.meta.Damageable;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -333,31 +332,61 @@ public class ItemStackBuilder {
/** /**
* Sets the {@code can_break} data component to the provided list of block predicate. * Sets the {@code can_break} data component to the provided list of {@link Material}.
* @param canBreak a list of {@link Material}.
* @return itself.
*/
public ItemStackBuilder canBreakMaterials(Collection<Material> canBreak) {
return canBreak(canBreak.stream().map(Material::getKey).toList());
}
/**
* Sets the {@code can_break} data component to the provided list of {@link NamespacedKey}.
* @param canBreak a list of block predicate. If empty, unsets the data component. If null, reset to default. * @param canBreak a list of block predicate. If empty, unsets the data component. If null, reset to default.
* @return itself. * @return itself.
*/ */
public ItemStackBuilder canBreak(List<BlockPredicate> canBreak) { @SuppressWarnings("removal")
public ItemStackBuilder canBreak(Collection<NamespacedKey> canBreak) {
@SuppressWarnings("unchecked")
Collection<com.destroystokyo.paper.Namespaced> nsCanBreak = (Collection<com.destroystokyo.paper.Namespaced>) (Collection<?>) canBreak;
return meta(m -> m.setPlaceableKeys(nsCanBreak));
/*
if (canBreak == null) if (canBreak == null)
return resetData(DataComponentTypes.CAN_BREAK); return resetData(DataComponentTypes.CAN_BREAK);
else if (canBreak.isEmpty()) else if (canBreak.isEmpty())
return unsetData(DataComponentTypes.CAN_BREAK); return unsetData(DataComponentTypes.CAN_BREAK);
else else
return data(DataComponentTypes.CAN_BREAK, ItemAdventurePredicate.itemAdventurePredicate(canBreak)); return data(DataComponentTypes.CAN_BREAK, ItemAdventurePredicate.itemAdventurePredicate(canBreak));*/
} }
/** /**
* Sets the {@code can_place_on} data component to the provided list of block predicate. * Sets the {@code can_place_on} data component to the provided list of {@link Material}.
* @param canPlaceOn a list of {@link Material}.
* @return itself.
*/
public ItemStackBuilder canPlaceOnMaterials(Collection<Material> canPlaceOn) {
return canPlaceOn(canPlaceOn.stream().map(Material::getKey).toList());
}
/**
* Sets the {@code can_place_on} data component to the provided list of {@link NamespacedKey}.
* @param canPlaceOn a list of block predicate. If empty, unsets the data component. If null, reset to default. * @param canPlaceOn a list of block predicate. If empty, unsets the data component. If null, reset to default.
* @return itself. * @return itself.
*/ */
public ItemStackBuilder canPlaceOn(List<BlockPredicate> canPlaceOn) { @SuppressWarnings("removal")
if (canPlaceOn == null) public ItemStackBuilder canPlaceOn(Collection<NamespacedKey> canPlaceOn) {
@SuppressWarnings("unchecked")
Collection<com.destroystokyo.paper.Namespaced> nsCanPlaceOn = (Collection<com.destroystokyo.paper.Namespaced>) (Collection<?>) canPlaceOn;
return meta(m -> m.setPlaceableKeys(nsCanPlaceOn));
/* if (canPlaceOn == null)
return resetData(DataComponentTypes.CAN_PLACE_ON); return resetData(DataComponentTypes.CAN_PLACE_ON);
else if (canPlaceOn.isEmpty()) else if (canPlaceOn.isEmpty())
return unsetData(DataComponentTypes.CAN_PLACE_ON); return unsetData(DataComponentTypes.CAN_PLACE_ON);
else else
return data(DataComponentTypes.CAN_PLACE_ON, ItemAdventurePredicate.itemAdventurePredicate(canPlaceOn)); return data(DataComponentTypes.CAN_PLACE_ON, ItemAdventurePredicate.itemAdventurePredicate(canPlaceOn)); */
} }