1
0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-28 14:36:26 +01:00

Add Decorated Pot Cracked API ()

This commit is contained in:
Fabrizio La Rosa 2024-09-08 22:12:36 +02:00 committed by GitHub
parent b09eaf2e8d
commit 971a7a5511
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
433 changed files with 104 additions and 61 deletions
patches/api
0335-Add-missing-block-data-API.patch0366-Add-EquipmentSlot-convenience-methods.patch0366-Allow-changing-bed-s-occupied-property.patch0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch0368-Add-entity-knockback-API.patch0369-Added-EntityToggleSitEvent.patch0370-Add-Moving-Piston-API.patch0371-Add-PrePlayerAttackEntityEvent.patch0372-Add-Player-Warden-Warning-API.patch0373-More-vanilla-friendly-methods-to-update-trades.patch0374-Add-paper-dumplisteners-command.patch0375-ItemStack-damage-API.patch0376-Add-Tick-TemporalUnit.patch0377-Friction-API.patch0378-Player-Entity-Tracking-Events.patch0379-Add-missing-Fluid-type.patch0380-fix-Instruments.patch0381-Add-BlockLockCheckEvent.patch0382-Add-Sneaking-API-for-Entities.patch0383-Improve-PortalEvents.patch0384-Flying-Fall-Damage-API.patch0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch0386-Win-Screen-API.patch0387-Add-Entity-Body-Yaw-API.patch0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch0389-Add-EntityFertilizeEggEvent.patch0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch0391-Add-Shearable-API.patch0392-Fix-SpawnEggMeta-get-setSpawnedType.patch0393-Add-Mob-Experience-reward-API.patch0394-Expand-PlayerItemMendEvent.patch0395-Add-method-to-remove-all-active-potion-effects.patch0396-Folia-scheduler-and-owned-region-API.patch0397-Add-event-for-player-editing-sign.patch0398-More-Sign-Block-API.patch0399-Fix-BanList-API.patch0400-Add-whitelist-events.patch0401-API-for-updating-recipes-on-clients.patch0402-Add-PlayerFailMoveEvent.patch0403-Fix-custom-statistic-criteria-creation.patch0404-SculkCatalyst-bloom-API.patch0405-API-for-an-entity-s-scoreboard-name.patch0406-Deprecate-and-replace-methods-with-old-StructureType.patch0407-Add-Listing-API-for-Player.patch0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch0409-Fix-NPE-on-Boat-getStatus.patch0410-Expand-Pose-API.patch0411-MerchantRecipe-add-copy-constructor.patch0412-More-DragonBattle-API.patch0413-Add-PlayerPickItemEvent.patch0414-Allow-trident-custom-damage.patch0415-Expose-hand-during-BlockCanBuildEvent.patch0416-Limit-setBurnTime-to-valid-short-values.patch0417-Add-OfflinePlayer-isConnected.patch0418-Add-titleOverride-to-InventoryOpenEvent.patch0419-Allow-proper-checking-of-empty-item-stacks.patch0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch0421-Add-player-idle-duration-API.patch0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch0423-Add-predicate-for-blocks-when-raytracing.patch0424-Add-hand-to-fish-event-for-all-player-interactions.patch0425-Attribute-Modifier-API-improvements.patch0426-Expand-LingeringPotion-API.patch0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch0428-Add-Structure-check-API.patch0429-Experimental-annotations-change.patch0430-Add-more-scoreboard-API.patch0431-Improve-Registry.patch0432-Add-experience-points-API.patch0433-Add-missing-InventoryType.patch0434-Add-drops-to-shear-events.patch0435-Add-HiddenPotionEffect-API.patch0436-Add-PlayerShieldDisableEvent.patch0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch0438-Add-BlockStateMeta-clearBlockState.patch0439-Expose-LootTable-of-DecoratedPot.patch0440-Add-ShulkerDuplicateEvent.patch0441-Add-api-for-spawn-egg-texture-colors.patch0442-Add-Lifecycle-Event-system.patch0443-ItemStack-Tooltip-API.patch0444-Add-getChunkSnapshot-includeLightData-parameter.patch0445-Add-FluidState-API.patch0446-add-number-format-api.patch0447-improve-BanList-types.patch0448-Suspicious-Effect-Entry-API.patch0449-Fix-DamageSource-API.patch0450-Expanded-Hopper-API.patch0451-Clone-mutables-to-prevent-unexpected-issues.patch0452-Add-BlockBreakProgressUpdateEvent.patch0453-Deprecate-ItemStack-setType.patch0454-Item-Mutation-Fixes.patch0455-API-for-checking-sent-chunks.patch0456-Add-CartographyItemEvent.patch0457-More-Raid-API.patch0458-Fix-SpawnerEntry-Equipment-API.patch0459-Fix-ItemFlags.patch0460-Allow-modifying-library-loader-jars-bytecode.patch0461-Add-hook-to-remap-library-jars.patch0462-Add-GameMode-isInvulnerable.patch0463-Expose-hasColor-to-leather-armor.patch

View File

@ -1,8 +1,13 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com> From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 16 Oct 2021 22:57:10 -0700 Date: Sat, 16 Oct 2021 22:57:10 -0700
Subject: [PATCH] Add missing block data mins and maxes Subject: [PATCH] Add missing block data API
General purpose patch adding missing getters/setters to BlockData and
its child types.
Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
Co-authored-by: Fabrizio La Rosa <lr.fabrizio@gmail.com>
diff --git a/src/main/java/org/bukkit/block/data/Levelled.java b/src/main/java/org/bukkit/block/data/Levelled.java diff --git a/src/main/java/org/bukkit/block/data/Levelled.java b/src/main/java/org/bukkit/block/data/Levelled.java
index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c23dfd95e2 100644 index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c23dfd95e2 100644
@ -22,6 +27,26 @@ index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c2
+ int getMinimumLevel(); + int getMinimumLevel();
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java
index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644
--- a/src/main/java/org/bukkit/block/data/type/Bed.java
+++ b/src/main/java/org/bukkit/block/data/type/Bed.java
@@ -35,6 +35,15 @@ public interface Bed extends Directional {
*/
boolean isOccupied();
+ // Paper start
+ /**
+ * Sets the value of the 'occupied' property.
+ *
+ * @param occupied the new 'occupied' value
+ */
+ void setOccupied(boolean occupied);
+ // Paper end
+
/**
* Horizontal half of a bed.
*/
diff --git a/src/main/java/org/bukkit/block/data/type/Candle.java b/src/main/java/org/bukkit/block/data/type/Candle.java diff --git a/src/main/java/org/bukkit/block/data/type/Candle.java b/src/main/java/org/bukkit/block/data/type/Candle.java
index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d040267caef75 100644 index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d040267caef75 100644
--- a/src/main/java/org/bukkit/block/data/type/Candle.java --- a/src/main/java/org/bukkit/block/data/type/Candle.java
@ -40,6 +65,28 @@ index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d0402
+ int getMinimumCandles(); + int getMinimumCandles();
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
index eb0ffa977450ef0c79caa78302cfe75ee35b34b7..b3d290dbfdcbadcbadcb54e6b414e423eba80cc6 100644
--- a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+++ b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
@@ -4,4 +4,17 @@ import org.bukkit.block.data.Directional;
import org.bukkit.block.data.Waterlogged;
public interface DecoratedPot extends Directional, Waterlogged {
+ // Paper start - add missing block data api
+ /**
+ * @return whether the pot is cracked
+ */
+ public boolean isCracked();
+
+ /**
+ * Set whether the pot is cracked.
+ *
+ * @param cracked whether the pot is cracked
+ */
+ public void setCracked(boolean cracked);
+ // Paper end - add missing block data api
}
diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/java/org/bukkit/block/data/type/Leaves.java diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/java/org/bukkit/block/data/type/Leaves.java
index 3ea21dfad26222ee70fbc627595f54de1a28aa96..cd013a7c42648d819d1e91c7cf9f97a8190c1fad 100644 index 3ea21dfad26222ee70fbc627595f54de1a28aa96..cd013a7c42648d819d1e91c7cf9f97a8190c1fad 100644
--- a/src/main/java/org/bukkit/block/data/type/Leaves.java --- a/src/main/java/org/bukkit/block/data/type/Leaves.java

View File

@ -1,26 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SoSeDiK <mrsosedik@gmail.com>
Date: Wed, 12 Oct 2022 00:36:55 +0300
Subject: [PATCH] Allow changing bed's 'occupied' property
diff --git a/src/main/java/org/bukkit/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java
index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644
--- a/src/main/java/org/bukkit/block/data/type/Bed.java
+++ b/src/main/java/org/bukkit/block/data/type/Bed.java
@@ -35,6 +35,15 @@ public interface Bed extends Directional {
*/
boolean isOccupied();
+ // Paper start
+ /**
+ * Sets the value of the 'occupied' property.
+ *
+ * @param occupied the new 'occupied' value
+ */
+ void setOccupied(boolean occupied);
+ // Paper end
+
/**
* Horizontal half of a bed.
*/

View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 22428de50580f7b70d14484ba229aa271bfd7069..fc96043f799cf5d521d51ad4c74f8f8067bed754 100644 index 0c7d96bc296b56dc9ff0ada89bb4d715716f8adc..fb62933d589ccbe4181a7b9633bb742ae35f68dd 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index fc96043f799cf5d521d51ad4c74f8f8067bed754..8dd993ce32686431e1c759d446a3620cb52f7ec1 100644 index fb62933d589ccbe4181a7b9633bb742ae35f68dd..597a3b581cb6fa2605fd5916e5639c1020d688b7 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

View File

@ -8,7 +8,7 @@ to simulate damage done to an itemstack and all
the logic associated with damaging them the logic associated with damaging them
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 8dd993ce32686431e1c759d446a3620cb52f7ec1..0d665a31152c9a667576f2e9d91ffec5304ce944 100644 index 597a3b581cb6fa2605fd5916e5639c1020d688b7..c9c3b926c5bb408d964ed5acc9f95c8527837a25 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

View File

@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5
/** /**
* Gets the item stack associated with this item drop. * Gets the item stack associated with this item drop.
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 0d665a31152c9a667576f2e9d91ffec5304ce944..a2c1cc7462564411db71a1e00222ef55633b49c8 100644 index c9c3b926c5bb408d964ed5acc9f95c8527837a25..7c027d7bbd6b8a1543fa92d44e99674925f093b3 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;

View File

@ -53,7 +53,7 @@ index 6dcaf7e9bc9afb708ab569e82f27c87833450ff1..a76e537c9b3b9519cd46894c90b750f0
// Paper start - Collision API // Paper start - Collision API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index a2c1cc7462564411db71a1e00222ef55633b49c8..4974540e8277011e4eb00f691a5f6f96d3dde20c 100644 index 7c027d7bbd6b8a1543fa92d44e99674925f093b3..f5149d54d6cb5019f398718b9aa52bc3ab34a5ae 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 4974540e8277011e4eb00f691a5f6f96d3dde20c..5de7651f673cba9782f88f46dc938274b37a38ec 100644 index f5149d54d6cb5019f398718b9aa52bc3ab34a5ae..ad3717d963f28751d410e6688ae64a4c1175871d 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

View File

@ -70,7 +70,7 @@ index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..f1fa86ddf1f50a357c9e94cc61261d8c
* Remove a modifier from this instance. * Remove a modifier from this instance.
* *
diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
index c6b8700d258b859d246118868167497397010292..3808f76d49e24c20156c013f68e00efa9351f1a3 100644 index ee39c0b83e558681e8b006172d34c98e2c83cda2..c57690798108e9f91f8c552f39dcc2b080fe1b61 100644
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
@@ -25,26 +25,32 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { @@ -25,26 +25,32 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {

View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 5de7651f673cba9782f88f46dc938274b37a38ec..5c29956c6db53440322330ff723c7087193641f1 100644 index ad3717d963f28751d410e6688ae64a4c1175871d..8369da45206d2606f0715f3d803163dd8028251e 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

Some files were not shown because too many files have changed in this diff Show More