mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 11:27:35 +01:00
3b9db2b194
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: bb4e97c6 Add support for Java 23 bc6874dd Bump asm to 9.7.1 50e8a00b PR-1064: Add specific getTopInventory methods for InventoryView derivatives 758b0a0f SPIGOT-7911: Fix Location#isWorldLoaded() for re-loaded worlds 133a64a7 Improve Registry#getOrThrow messages be0f5957 PR-1058: Add tests for Minecraft registry <-> Bukkit fields d1b31df2 PR-1062: Clarify BeaconView documentation 3fab4384 PR-1060: Cache Material to BlockType and ItemType conversion 967a7301 SPIGOT-7906: Increase YAML nesting limit to 100 6ecf033d SPIGOT-7899: Smithing recipes don't require inputs CraftBukkit Changes: 0a7bd6c81 PR-1493: Improve reroute performance and add some tests 54941524c Add support for Java 23 f4d957fff SPIGOT-7915: Fix World#getKeepSpawnInMemory() using Spawn Radius rather than Spawn Chunk Radius ded183674 Fix HIDE_ENCHANTS flag in items without enchantments 308785a0a Bump asm to 9.7.1 and re-add ClassReader to ClassWriter 72ce823cd PR-1487: Add specific getTopInventory methods for InventoryView derivatives 11a5e840c SPIGOT-7907, PR-1484: Improve merchant recipe item matching behavior to more closely align with older versions 45b66f7e4 SPIGOT-7909: Always set HIDE_ENCHANTS flag to item if flag is set 963459791 Increase outdated build delay fc5b2d75f SPIGOT-7910: Fix launching breeze wind charge from API and improve dispenser launch API c7d6428f2 SPIGOT-7856, PR-1483: End platform not dropping items after replacing blocks 2a5572b52 SPIGOT-7780, PR-1482: Cannot edit chunks during unload event 527041ab5 SPIGOT-7902, PR-1477: Fix CraftMetaPotion#hasCustomEffects() does not check if customEffects (List) is empty 5529a1769 Implement base methods for tags 30fbdbaaf Improve Registry#getOrThrow messages 6b71a7322 PR-1475: Add tests for Minecraft registry <-> Bukkit fields 5f24c255c SPIGOT-7908: Mark junit-platform-suite-engine as test scope e4c92ef65 PR-1473: Change tests to use suites, to run tests in different environments and feature flags d25e1e722 PR-1481: Fix BeaconView#set[X]Effect(null) d69a05362 PR-1480: Fix PerMaterialTest#isEdible test running for legacy materials bb3284a89 PR-1479: Use custom #isBlock method in legacy init instead of the one in Material, since it relies on legacy being init 98c57cbbe SPIGOT-7904: Fix NPE for PlayerItemBreakEvent f35bae9ec Fix missing hasJukeboxPlayable 8a6f8b6d8 SPIGOT-7881: CTRL+Pick Block saves position data into item 7913b3be7 SPIGOT-7899: Smithing recipes don't require inputs
156 lines
7.8 KiB
Diff
156 lines
7.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 12 Sep 2018 18:53:55 +0300
|
|
Subject: [PATCH] Add API for CanPlaceOn and CanDestroy NBT values
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
index 7f6f404f5a2be7876ae239355979e8c8a7a198ce..07f31bce96e3c47bea43b5d6443070ae158430ef 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
@@ -2185,4 +2185,117 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
|
}
|
|
// Paper end
|
|
|
|
+ // Paper start - Add an API for can-place-on/can-break adventure mode predicates
|
|
+ @Override
|
|
+ public Set<Material> getCanDestroy() {
|
|
+ return !this.hasDestroyableKeys() ? Collections.emptySet() : convertToLegacyMaterial(this.canBreakPredicates);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCanDestroy(final Set<Material> canDestroy) {
|
|
+ Preconditions.checkArgument(canDestroy != null, "Cannot replace with null set!");
|
|
+ this.canBreakPredicates = convertFromLegacyMaterial(canDestroy);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Set<Material> getCanPlaceOn() {
|
|
+ return !this.hasPlaceableKeys() ? Collections.emptySet() : convertToLegacyMaterial(this.canPlaceOnPredicates);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCanPlaceOn(final Set<Material> canPlaceOn) {
|
|
+ Preconditions.checkArgument(canPlaceOn != null, "Cannot replace with null set!");
|
|
+ this.canPlaceOnPredicates = convertFromLegacyMaterial(canPlaceOn);
|
|
+ }
|
|
+
|
|
+ private static List<net.minecraft.advancements.critereon.BlockPredicate> convertFromLegacyMaterial(final Collection<Material> materials) {
|
|
+ return materials.stream().map(m -> {
|
|
+ return net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(CraftBlockType.bukkitToMinecraft(m)).build();
|
|
+ }).toList();
|
|
+ }
|
|
+
|
|
+ private static Set<Material> convertToLegacyMaterial(final List<net.minecraft.advancements.critereon.BlockPredicate> predicates) {
|
|
+ return predicates.stream()
|
|
+ .flatMap(p -> p.blocks().map(net.minecraft.core.HolderSet::stream).orElse(java.util.stream.Stream.empty()))
|
|
+ .map(holder -> CraftBlockType.minecraftToBukkit(holder.value()))
|
|
+ .collect(java.util.stream.Collectors.toSet());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Set<com.destroystokyo.paper.Namespaced> getDestroyableKeys() {
|
|
+ return !this.hasDestroyableKeys() ? Collections.emptySet() : convertToLegacyNamespaced(this.canBreakPredicates);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setDestroyableKeys(final Collection<com.destroystokyo.paper.Namespaced> canDestroy) {
|
|
+ Preconditions.checkArgument(canDestroy != null, "Cannot replace with null collection!");
|
|
+ Preconditions.checkArgument(ofAcceptableType(canDestroy), "Can only use NamespacedKey or NamespacedTag objects!");
|
|
+ this.canBreakPredicates = convertFromLegacyNamespaced(canDestroy);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Set<com.destroystokyo.paper.Namespaced> getPlaceableKeys() {
|
|
+ return !this.hasPlaceableKeys() ? Collections.emptySet() : convertToLegacyNamespaced(this.canPlaceOnPredicates);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setPlaceableKeys(final Collection<com.destroystokyo.paper.Namespaced> canPlaceOn) {
|
|
+ Preconditions.checkArgument(canPlaceOn != null, "Cannot replace with null collection!");
|
|
+ Preconditions.checkArgument(ofAcceptableType(canPlaceOn), "Can only use NamespacedKey or NamespacedTag objects!");
|
|
+ this.canPlaceOnPredicates = convertFromLegacyNamespaced(canPlaceOn);
|
|
+ }
|
|
+
|
|
+ private static List<net.minecraft.advancements.critereon.BlockPredicate> convertFromLegacyNamespaced(final Collection<com.destroystokyo.paper.Namespaced> namespaceds) {
|
|
+ final List<net.minecraft.advancements.critereon.BlockPredicate> predicates = new ArrayList<>();
|
|
+ for (final com.destroystokyo.paper.Namespaced namespaced : namespaceds) {
|
|
+ if (namespaced instanceof final org.bukkit.NamespacedKey key) {
|
|
+ predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(CraftBlockType.bukkitToMinecraft(Objects.requireNonNull(org.bukkit.Registry.MATERIAL.get(key)))).build());
|
|
+ } else if (namespaced instanceof final com.destroystokyo.paper.NamespacedTag tag) {
|
|
+ predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(net.minecraft.tags.TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(tag.getNamespace(), tag.getKey()))).build());
|
|
+ }
|
|
+ }
|
|
+ return predicates;
|
|
+ }
|
|
+
|
|
+ private static Set<com.destroystokyo.paper.Namespaced> convertToLegacyNamespaced(final Collection<net.minecraft.advancements.critereon.BlockPredicate> predicates) {
|
|
+ final Set<com.destroystokyo.paper.Namespaced> namespaceds = Sets.newHashSet();
|
|
+ for (final net.minecraft.advancements.critereon.BlockPredicate predicate : predicates) {
|
|
+ if (predicate.blocks().isEmpty()) {
|
|
+ continue;
|
|
+ }
|
|
+ final net.minecraft.core.HolderSet<net.minecraft.world.level.block.Block> holders = predicate.blocks().get();
|
|
+ if (holders instanceof final net.minecraft.core.HolderSet.Named<net.minecraft.world.level.block.Block> named) {
|
|
+ namespaceds.add(new com.destroystokyo.paper.NamespacedTag(named.key().location().getNamespace(), named.key().location().getPath()));
|
|
+ } else {
|
|
+ holders.forEach(h -> {
|
|
+ h.unwrapKey().ifPresent(key -> {
|
|
+ namespaceds.add(new org.bukkit.NamespacedKey(key.location().getNamespace(), key.location().getPath()));
|
|
+ });
|
|
+ });
|
|
+ }
|
|
+ }
|
|
+ return namespaceds;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasPlaceableKeys() {
|
|
+ return this.canPlaceOnPredicates != null;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasDestroyableKeys() {
|
|
+ return this.canBreakPredicates != null;
|
|
+ }
|
|
+
|
|
+ // not a fan of this
|
|
+ private static boolean ofAcceptableType(final Collection<com.destroystokyo.paper.Namespaced> namespacedResources) {
|
|
+ for (com.destroystokyo.paper.Namespaced resource : namespacedResources) {
|
|
+ if (!(resource instanceof org.bukkit.NamespacedKey || resource instanceof com.destroystokyo.paper.NamespacedTag)) {
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return true;
|
|
+ }
|
|
+ // Paper end - Add an API for can-place-on/can-break adventure mode predicates
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
|
|
index 6930d0afb230a88aa813b02e4d55c95d3a049688..db8d8e2a07296d62c3097f02b03319e2e1ba9394 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
|
|
@@ -690,4 +690,22 @@ public class MaterialRerouting {
|
|
return ItemStack.of(material, amount);
|
|
}
|
|
// Paper end
|
|
+
|
|
+ // Paper start - methods added post 1.13, no-op (https://github.com/PaperMC/Paper/pull/1015)
|
|
+ public static Set<Material> getCanDestroy(final ItemMeta meta) {
|
|
+ return meta.getCanDestroy();
|
|
+ }
|
|
+
|
|
+ public static void setCanDestroy(final ItemMeta meta, final Set<Material> materials) {
|
|
+ meta.setCanDestroy(materials);
|
|
+ }
|
|
+
|
|
+ public static Set<Material> getCanPlaceOn(final ItemMeta meta) {
|
|
+ return meta.getCanPlaceOn();
|
|
+ }
|
|
+
|
|
+ public static void setCanPlaceOn(final ItemMeta meta, final Set<Material> materials) {
|
|
+ meta.setCanPlaceOn(materials);
|
|
+ }
|
|
+ // Paper end
|
|
}
|