More more more more more more more more more more more more more work
This commit is contained in:
parent
4e81c1fe78
commit
45c36e5d0c
29 changed files with 247 additions and 269 deletions
93
patches/api/0211-Support-components-in-ItemMeta.patch
Normal file
93
patches/api/0211-Support-components-in-ItemMeta.patch
Normal file
|
@ -0,0 +1,93 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MiniDigger <admin@minidigger.me>
|
||||
Date: Sat, 6 Jun 2020 18:13:16 +0200
|
||||
Subject: [PATCH] Support components in ItemMeta
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
||||
index 01b462fccce71cef3398dd43944046f322b8e57e..f093f991f1fedd20fcef041b093398250b7fb286 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
|
||||
@@ -5,6 +5,7 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
+import net.kyori.adventure.text.Component;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.attribute.AttributeModifier;
|
||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||
@@ -62,6 +63,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
||||
@NotNull
|
||||
String getDisplayName();
|
||||
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Gets the display name that is set.
|
||||
+ * <p>
|
||||
+ * Plugins should check that hasDisplayName() returns <code>true</code>
|
||||
+ * before calling this method.
|
||||
+ *
|
||||
+ * @return the display name that is set
|
||||
+ * @deprecated use {@link #displayName()}
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ @Deprecated
|
||||
+ net.md_5.bungee.api.chat.BaseComponent[] getDisplayNameComponent();
|
||||
+ // Paper end
|
||||
/**
|
||||
* Sets the display name.
|
||||
*
|
||||
@@ -71,6 +86,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
||||
@Deprecated // Paper
|
||||
void setDisplayName(@Nullable String name);
|
||||
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Sets the display name.
|
||||
+ *
|
||||
+ * @param component the name component to set
|
||||
+ * @deprecated use {@link #displayName(Component)}
|
||||
+ */
|
||||
+ @Deprecated
|
||||
+ void setDisplayNameComponent(@Nullable net.md_5.bungee.api.chat.BaseComponent[] component);
|
||||
+ // Paper end
|
||||
/**
|
||||
* Checks for existence of a localized name.
|
||||
*
|
||||
@@ -134,6 +159,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
||||
@Nullable
|
||||
List<String> getLore();
|
||||
|
||||
+ /**
|
||||
+ * Gets the lore that is set.
|
||||
+ * <p>
|
||||
+ * Plugins should check if hasLore() returns <code>true</code> before
|
||||
+ * calling this method.
|
||||
+ *
|
||||
+ * @return a list of lore that is set
|
||||
+ * @deprecated use {@link #lore()}
|
||||
+ */
|
||||
+ @Nullable
|
||||
+ @Deprecated
|
||||
+ List<net.md_5.bungee.api.chat.BaseComponent[]> getLoreComponents();
|
||||
+
|
||||
/**
|
||||
* Sets the lore for this item.
|
||||
* Removes lore when given null.
|
||||
@@ -144,6 +182,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
|
||||
@Deprecated // Paper
|
||||
void setLore(@Nullable List<String> lore);
|
||||
|
||||
+ /**
|
||||
+ * Sets the lore for this item.
|
||||
+ * Removes lore when given null.
|
||||
+ *
|
||||
+ * @param lore the lore that will be set
|
||||
+ * @deprecated use {@link #lore(List)}
|
||||
+ */
|
||||
+ @Deprecated
|
||||
+ void setLoreComponents(@Nullable List<net.md_5.bungee.api.chat.BaseComponent[]> lore);
|
||||
+
|
||||
/**
|
||||
* Checks for existence of custom model data.
|
||||
* <p>
|
|
@ -0,0 +1,25 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Fri, 3 Jul 2020 15:05:54 -0700
|
||||
Subject: [PATCH] added 2 new TargetReasons for 1.16 mob behavior
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
|
||||
index dee186e99463a56394bbc2039d1e763d109125b9..601904150156d475c18286b485f3409307a75950 100644
|
||||
--- a/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java
|
||||
@@ -159,6 +159,14 @@ public class EntityTargetEvent extends EntityEvent implements Cancellable {
|
||||
* as wheat in it's hand.
|
||||
*/
|
||||
TEMPT,
|
||||
+ /**
|
||||
+ * When the target is in a different dimension
|
||||
+ */
|
||||
+ TARGET_OTHER_LEVEL, // Paper
|
||||
+ /**
|
||||
+ * When the target is in creative or spectator mode, or the gamemode is peaceful, or other reasons
|
||||
+ */
|
||||
+ TARGET_INVALID, // Paper
|
||||
/**
|
||||
* A currently unknown reason for the entity changing target.
|
||||
*/
|
46
patches/api/0213-Add-entity-liquid-API.patch
Normal file
46
patches/api/0213-Add-entity-liquid-API.patch
Normal file
|
@ -0,0 +1,46 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 2 Jul 2020 18:11:33 -0500
|
||||
Subject: [PATCH] Add entity liquid API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
||||
index 4ed3486e8ef097837cf6762b618e08fa9ff166a5..b7d3cd271cccbc250914c5bc17ae892ffcf14b57 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -725,5 +725,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*/
|
||||
@NotNull
|
||||
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
|
||||
+
|
||||
+ /**
|
||||
+ * Check if entity is in rain
|
||||
+ */
|
||||
+ public boolean isInRain();
|
||||
+
|
||||
+ /**
|
||||
+ * Check if entity is in bubble column
|
||||
+ */
|
||||
+ public boolean isInBubbleColumn();
|
||||
+
|
||||
+ /**
|
||||
+ * Check if entity is in water or rain
|
||||
+ */
|
||||
+ public boolean isInWaterOrRain();
|
||||
+
|
||||
+ /**
|
||||
+ * Check if entity is in water or bubble column
|
||||
+ */
|
||||
+ public boolean isInWaterOrBubbleColumn();
|
||||
+
|
||||
+ /**
|
||||
+ * Check if entity is in water or rain or bubble column
|
||||
+ */
|
||||
+ public boolean isInWaterOrRainOrBubbleColumn();
|
||||
+
|
||||
+ /**
|
||||
+ * Check if entity is in lava
|
||||
+ */
|
||||
+ public boolean isInLava();
|
||||
// Paper end
|
||||
}
|
|
@ -0,0 +1,211 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 3 Jul 2020 11:58:56 -0500
|
||||
Subject: [PATCH] Add PrepareResultEvent / PrepareGrindstoneEvent
|
||||
|
||||
Adds a new event for all crafting stations that generate a result slot item
|
||||
|
||||
Anvil, Grindstone and Smithing now extend this event
|
||||
|
||||
Grindstone is a backwards compat from a previous PrepareGrindstoneEvent
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java b/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..449e8c06f8434b59d49a76481fa60c5c49e80579
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/inventory/PrepareGrindstoneEvent.java
|
||||
@@ -0,0 +1,28 @@
|
||||
+package com.destroystokyo.paper.event.inventory;
|
||||
+
|
||||
+import org.bukkit.event.HandlerList;
|
||||
+import org.bukkit.event.inventory.InventoryEvent;
|
||||
+import org.bukkit.inventory.GrindstoneInventory;
|
||||
+import org.bukkit.inventory.InventoryView;
|
||||
+import org.bukkit.inventory.ItemStack;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
+import org.jetbrains.annotations.Nullable;
|
||||
+
|
||||
+/**
|
||||
+ * Called when an item is put in a slot for grinding in a Grindstone
|
||||
+ * @see com.destroystokyo.paper.event.inventory.PrepareResultEvent
|
||||
+ */
|
||||
+@Deprecated
|
||||
+public class PrepareGrindstoneEvent extends PrepareResultEvent {
|
||||
+
|
||||
+ public PrepareGrindstoneEvent(@NotNull InventoryView inventory, @Nullable ItemStack result) {
|
||||
+ super(inventory, result);
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ @Override
|
||||
+ public GrindstoneInventory getInventory() {
|
||||
+ return (GrindstoneInventory) super.getInventory();
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java b/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..045ce9ec3c9134aced5f5235b760ac85599d16c6
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/inventory/PrepareResultEvent.java
|
||||
@@ -0,0 +1,48 @@
|
||||
+package com.destroystokyo.paper.event.inventory;
|
||||
+
|
||||
+import org.bukkit.event.HandlerList;
|
||||
+import org.bukkit.event.inventory.InventoryEvent;
|
||||
+import org.bukkit.event.inventory.InventoryType;
|
||||
+import org.bukkit.inventory.InventoryView;
|
||||
+import org.bukkit.inventory.ItemStack;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
+import org.jetbrains.annotations.Nullable;
|
||||
+
|
||||
+/**
|
||||
+ * Called when an item is put in an inventory containing a result slot
|
||||
+ */
|
||||
+public class PrepareResultEvent extends InventoryEvent {
|
||||
+
|
||||
+ private static final HandlerList handlers = new HandlerList();
|
||||
+ private ItemStack result;
|
||||
+
|
||||
+ public PrepareResultEvent(@NotNull InventoryView inventory, @Nullable ItemStack result) {
|
||||
+ super(inventory);
|
||||
+ this.result = result;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Get result item, may be null.
|
||||
+ *
|
||||
+ * @return result item
|
||||
+ */
|
||||
+ @Nullable
|
||||
+ public ItemStack getResult() {
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ public void setResult(@Nullable ItemStack result) {
|
||||
+ this.result = result;
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ @Override
|
||||
+ public HandlerList getHandlers() {
|
||||
+ return handlers;
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ public static HandlerList getHandlerList() {
|
||||
+ return handlers;
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java b/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java
|
||||
index 77109a07f07aa6985106dc1a9ad5218f6c7f360f..f1f6f4ab4f81a3f21e757fef4a30b00e94371f8d 100644
|
||||
--- a/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/PrepareAnvilEvent.java
|
||||
@@ -1,5 +1,6 @@
|
||||
package org.bukkit.event.inventory;
|
||||
|
||||
+import com.destroystokyo.paper.event.inventory.PrepareResultEvent;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.inventory.AnvilInventory;
|
||||
import org.bukkit.inventory.InventoryView;
|
||||
@@ -10,14 +11,16 @@ import org.jetbrains.annotations.Nullable;
|
||||
/**
|
||||
* Called when an item is put in a slot for repair by an anvil.
|
||||
*/
|
||||
-public class PrepareAnvilEvent extends InventoryEvent {
|
||||
+// Paper start - extend PrepareResultEvent
|
||||
+public class PrepareAnvilEvent extends PrepareResultEvent {
|
||||
|
||||
- private static final HandlerList handlers = new HandlerList();
|
||||
- private ItemStack result;
|
||||
+ //private static final HandlerList handlers = new HandlerList();
|
||||
+ //private ItemStack result;
|
||||
|
||||
public PrepareAnvilEvent(@NotNull InventoryView inventory, @Nullable ItemStack result) {
|
||||
- super(inventory);
|
||||
- this.result = result;
|
||||
+ super(inventory, result);
|
||||
+ //this.result = result;
|
||||
+ // Paper end
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@@ -33,13 +36,14 @@ public class PrepareAnvilEvent extends InventoryEvent {
|
||||
*/
|
||||
@Nullable
|
||||
public ItemStack getResult() {
|
||||
- return result;
|
||||
+ return super.getResult(); // Paper
|
||||
}
|
||||
|
||||
public void setResult(@Nullable ItemStack result) {
|
||||
- this.result = result;
|
||||
+ super.setResult(result); // Paper
|
||||
}
|
||||
|
||||
+ /* // Paper - comment out
|
||||
@NotNull
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
@@ -50,4 +54,5 @@ public class PrepareAnvilEvent extends InventoryEvent {
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
+ */ // Paper
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java b/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java
|
||||
index 99af1540324c4d68c5890ac40b591c5cbdd2e870..0bc0ca4f96c800e9c46c61710f44446691d8b93f 100644
|
||||
--- a/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/PrepareSmithingEvent.java
|
||||
@@ -1,5 +1,6 @@
|
||||
package org.bukkit.event.inventory;
|
||||
|
||||
+import com.destroystokyo.paper.event.inventory.PrepareResultEvent;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.inventory.InventoryView;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
@@ -10,14 +11,16 @@ import org.jetbrains.annotations.Nullable;
|
||||
/**
|
||||
* Called when an item is put in a slot for upgrade by a Smithing Table.
|
||||
*/
|
||||
-public class PrepareSmithingEvent extends InventoryEvent {
|
||||
+// Paper start - extend PrepareResultEvent
|
||||
+public class PrepareSmithingEvent extends PrepareResultEvent {
|
||||
|
||||
- private static final HandlerList handlers = new HandlerList();
|
||||
- private ItemStack result;
|
||||
+ //private static final HandlerList handlers = new HandlerList();
|
||||
+ //private ItemStack result;
|
||||
|
||||
public PrepareSmithingEvent(@NotNull InventoryView inventory, @Nullable ItemStack result) {
|
||||
- super(inventory);
|
||||
- this.result = result;
|
||||
+ super(inventory, result);
|
||||
+ //this.result = result;
|
||||
+ // Paper end
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@@ -33,13 +36,14 @@ public class PrepareSmithingEvent extends InventoryEvent {
|
||||
*/
|
||||
@Nullable
|
||||
public ItemStack getResult() {
|
||||
- return result;
|
||||
+ return super.getResult(); // Paper
|
||||
}
|
||||
|
||||
public void setResult(@Nullable ItemStack result) {
|
||||
- this.result = result;
|
||||
+ super.setResult(result); // Paper
|
||||
}
|
||||
|
||||
+ /* // Paper - comment out
|
||||
@NotNull
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
@@ -50,4 +54,5 @@ public class PrepareSmithingEvent extends InventoryEvent {
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
+ */ // Paper
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue