Finish API patches
This commit is contained in:
		
					parent
					
						
							
								b52915b54e
							
						
					
				
			
			
				commit
				
					
						0ef31547a1
					
				
			
		
					 1070 changed files with 21 additions and 991 deletions
				
			
		| 
						 | 
				
			
			@ -40,7 +40,7 @@ How To (Plugin Developers)
 | 
			
		|||
<dependency>
 | 
			
		||||
    <groupId>io.papermc.paper</groupId>
 | 
			
		||||
    <artifactId>paper-api</artifactId>
 | 
			
		||||
    <version>1.20.6-R0.1-SNAPSHOT</version>
 | 
			
		||||
    <version>1.21-R0.1-SNAPSHOT</version>
 | 
			
		||||
    <scope>provided</scope>
 | 
			
		||||
</dependency>
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ repositories {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
dependencies {
 | 
			
		||||
    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
 | 
			
		||||
    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
java {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,9 @@
 | 
			
		|||
group=io.papermc.paper
 | 
			
		||||
version=1.20.6-R0.1-SNAPSHOT
 | 
			
		||||
mcVersion=1.20.6
 | 
			
		||||
version=1.21-R0.1-SNAPSHOT
 | 
			
		||||
mcVersion=1.21
 | 
			
		||||
 | 
			
		||||
# Set to true while updating Minecraft version
 | 
			
		||||
updatingMinecraft=false
 | 
			
		||||
updatingMinecraft=true
 | 
			
		||||
 | 
			
		||||
org.gradle.caching=true
 | 
			
		||||
org.gradle.parallel=true
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -193,12 +193,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
--- a/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
 | 
			
		||||
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
 | 
			
		||||
 
 | 
			
		||||
 /**
 | 
			
		||||
  * This event is fired when the spawn point of the player is changed.
 | 
			
		||||
  * @apiNote draft API
 | 
			
		||||
+ * @deprecated use {@link com.destroystokyo.paper.event.player.PlayerSetSpawnEvent}
 | 
			
		||||
  */
 | 
			
		||||
 @ApiStatus.Experimental
 | 
			
		||||
+@Deprecated(forRemoval = true) // Paper
 | 
			
		||||
 public class PlayerSpawnChangeEvent extends PlayerEvent implements Cancellable {
 | 
			
		||||
 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -302,7 +302,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
+    @Deprecated(since = "1.20.6")
 | 
			
		||||
+    Registry<DamageType> DAMAGE_TYPE = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(DamageType.class), "No registry present for DamageType. This is a bug."); // Paper
 | 
			
		||||
     /**
 | 
			
		||||
      * Villager profession.
 | 
			
		||||
      * Jukebox songs.
 | 
			
		||||
      *
 | 
			
		||||
@@ -0,0 +0,0 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
 | 
			
		||||
      * Wolf variants.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -58,8 +58,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
--- a/src/main/java/org/bukkit/entity/Bogged.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/entity/Bogged.java
 | 
			
		||||
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.ApiStatus;
 | 
			
		||||
  * Represents a Bogged Skeleton.
 | 
			
		||||
  */
 | 
			
		||||
 @MinecraftExperimental(Requires.UPDATE_1_21)
 | 
			
		||||
 @ApiStatus.Experimental
 | 
			
		||||
-public interface Bogged extends AbstractSkeleton {
 | 
			
		||||
+public interface Bogged extends AbstractSkeleton, io.papermc.paper.entity.Shearable { // Paper - Shear API
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -138,7 +138,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
  * @see <a href="https://minecraft.wiki/w/Data_pack">Minecraft wiki</a>
 | 
			
		||||
+ * @deprecated use {@link io.papermc.paper.datapack.Datapack}
 | 
			
		||||
  */
 | 
			
		||||
 @ApiStatus.Experimental
 | 
			
		||||
+@Deprecated(forRemoval = true) // Paper
 | 
			
		||||
 public interface DataPack extends Keyed {
 | 
			
		||||
 
 | 
			
		||||
| 
						 | 
				
			
			@ -153,7 +152,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
  * Manager of data packs.
 | 
			
		||||
+ * @deprecated use {@link io.papermc.paper.datapack.DatapackManager}
 | 
			
		||||
  */
 | 
			
		||||
 @ApiStatus.Experimental
 | 
			
		||||
+@Deprecated(forRemoval = true) // Paper
 | 
			
		||||
 public interface DataPackManager {
 | 
			
		||||
 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -128,7 +128,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
  * This event is fired when a sign is opened by the player.
 | 
			
		||||
+ * @deprecated use {@link io.papermc.paper.event.player.PlayerOpenSignEvent}
 | 
			
		||||
  */
 | 
			
		||||
 @ApiStatus.Experimental
 | 
			
		||||
+@Deprecated(forRemoval = true) // Paper
 | 
			
		||||
+@org.bukkit.Warning(false) // Paper
 | 
			
		||||
 public class PlayerSignOpenEvent extends PlayerEvent implements Cancellable {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1399,6 +1399,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
     void setMotd(@NotNull String motd);
 | 
			
		||||
 
 | 
			
		||||
     /**
 | 
			
		||||
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
 | 
			
		||||
      * Gets the default message that is displayed when the server is stopped.
 | 
			
		||||
      *
 | 
			
		||||
      * @return the shutdown message
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -332,7 +332,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
     @ApiStatus.Internal
 | 
			
		||||
     public enum Requires {
 | 
			
		||||
 
 | 
			
		||||
-        UPDATE_1_21
 | 
			
		||||
+        UPDATE_1_21, BUNDLE, TRADE_REBALANCE // Paper
 | 
			
		||||
+        BUNDLE, TRADE_REBALANCE // Paper
 | 
			
		||||
     }
 | 
			
		||||
 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
-
 | 
			
		||||
-    <groupId>org.spigotmc</groupId>
 | 
			
		||||
-    <artifactId>spigot-api</artifactId>
 | 
			
		||||
-    <version>1.20.6-R0.1-SNAPSHOT</version>
 | 
			
		||||
-    <version>1.21-R0.1-SNAPSHOT</version>
 | 
			
		||||
-    <packaging>jar</packaging>
 | 
			
		||||
-
 | 
			
		||||
-    <name>Spigot-API</name>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@ diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/mai
 | 
			
		|||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 | 
			
		||||
@@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable {
 | 
			
		||||
@@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
 | 
			
		||||
      */
 | 
			
		||||
     @Nullable
 | 
			
		||||
     @Deprecated
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -275,9 +275,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
			
		|||
--- a/src/main/java/org/bukkit/block/Crafter.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/block/Crafter.java
 | 
			
		||||
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.ApiStatus;
 | 
			
		||||
  * Represents a captured state of a crafter.
 | 
			
		||||
  */
 | 
			
		||||
 @ApiStatus.Experimental
 | 
			
		||||
 @MinecraftExperimental(Requires.UPDATE_1_21)
 | 
			
		||||
-public interface Crafter extends Container, Lootable {
 | 
			
		||||
+public interface Crafter extends Container, com.destroystokyo.paper.loottable.LootableBlockInventory { // Paper - LootTable API
 | 
			
		||||
 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							Some files were not shown because too many files have changed in this diff Show more
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue