mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update B/CB/S

Browse source
This commit is contained in:
Shane Freeder 2017-08-05 23:36:47 +01:00
parent f7e23ba7fa
commit bec1253aa9
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
8 changed files with 92 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Spigot-API-Patches/0001-POM-changes.patch
View file

@ -1,34 +1,32 @@
From ed103e824a3c48330567e5b1a0a7bc112e94c4da Mon Sep 17 00:00:00 2001
From 4bbb8c7aa24cea492d251eae531d0d88c1565b94 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 8c6d1aa1..07143b46 100644
index f175b611..2fe7b78e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,44 +4,38 @@
@@ -3,39 +3,39 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
</parent>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
+ <parent>
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ </parent>
+
+ <groupId>com.destroystokyo.paper</groupId>
+ <artifactId>paper-api</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Spigot-API</name>
- <url>http://www.spigotmc.org/</url>
- <url>https://www.spigotmc.org/</url>
+ <name>Paper-API</name>
+ <url>https://github.com/PaperMC/Paper</url>
<description>An enhanced plugin API for Minecraft servers.</description>
@ -67,7 +65,7 @@ index 8c6d1aa1..07143b46 100644
<pluginRepositories>
<pluginRepository>
<id>spigotmc-public</id>
@@ -49,6 +43,17 @@
@@ -43,6 +43,17 @@
</pluginRepository>
</pluginRepositories>
@ -85,7 +83,7 @@ index 8c6d1aa1..07143b46 100644
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -63,6 +68,13 @@
@@ -57,6 +68,13 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
@ -99,7 +97,7 @@ index 8c6d1aa1..07143b46 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -107,6 +119,7 @@
@@ -101,6 +119,7 @@
</dependencies>
<build>
@ -107,7 +105,7 @@ index 8c6d1aa1..07143b46 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -126,26 +139,6 @@
@@ -120,26 +139,6 @@
</dependencies>
</plugin>
<plugin>
@ -134,16 +132,14 @@ index 8c6d1aa1..07143b46 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
@@ -158,8 +151,7 @@
@@ -152,6 +151,7 @@
</execution>
</executions>
<configuration>
- <!-- utterly useless artifact from shade 2.x -->
- <createDependencyReducedPom>false</createDependencyReducedPom>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
--
2.13.3.windows.1
2.13.4

57
Spigot-API-Patches/0037-LootTable-API.patch
View file

@ -1,4 +1,4 @@
From bc7df9c5fea137834099549bf47b227df1813165 Mon Sep 17 00:00:00 2001
From 75943d87ca42348d2b2e4bc29498717ec1390150 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 15:19:49 -0400
Subject: [PATCH] LootTable API
@ -295,83 +295,78 @@ index 00000000..2169493d
+ }
+}
diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
index ade09ddd..368306d0 100644
index 97dc7813..a24a4094 100644
--- a/src/main/java/org/bukkit/block/Chest.java
+++ b/src/main/java/org/bukkit/block/Chest.java
@@ -1,13 +1,14 @@
@@ -1,12 +1,13 @@
package org.bukkit.block;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a chest.
* Represents a captured state of a chest.
*/
-public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
-public interface Chest extends Container, Nameable {
+public interface Chest extends Container, Nameable, LootableInventory { // Paper
/**
* Returns the chest's inventory. If this is a double chest, it returns
* Gets the inventory of the chest block represented by this block state.
diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
index 39ee9b04..236ffa32 100644
index 108332df..4430b123 100644
--- a/src/main/java/org/bukkit/block/Dispenser.java
+++ b/src/main/java/org/bukkit/block/Dispenser.java
@@ -1,13 +1,14 @@
@@ -1,12 +1,13 @@
package org.bukkit.block;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.projectiles.BlockProjectileSource;
/**
* Represents a dispenser.
* Represents a captured state of a dispenser.
*/
-public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
-public interface Dispenser extends Container, Nameable {
+public interface Dispenser extends Container, Nameable, LootableInventory { // Paper
/**
* Gets the BlockProjectileSource object for this dispenser.
* Gets the BlockProjectileSource object for the dispenser.
diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
index 8e5e3e89..c08a1a50 100644
index bc3aeef2..5b698613 100644
--- a/src/main/java/org/bukkit/block/Hopper.java
+++ b/src/main/java/org/bukkit/block/Hopper.java
@@ -1,9 +1,12 @@
@@ -1,8 +1,9 @@
package org.bukkit.block;
import org.bukkit.Nameable;
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a hopper.
* Represents a captured state of a hopper.
*/
-public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable { }
+public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
+
+}
-public interface Hopper extends Container, Nameable { }
+public interface Hopper extends Container, Nameable, LootableInventory { } // Paper
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
index 003cfb8a..7b40df14 100644
index 4c1740e7..aa1109c4 100644
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
@@ -1,5 +1,6 @@
@@ -1,12 +1,13 @@
package org.bukkit.block;
+import com.destroystokyo.paper.loottable.LootableInventory;
import org.bukkit.DyeColor;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder;
@@ -7,7 +8,7 @@ import org.bukkit.inventory.InventoryHolder;
/**
* Represents a ShulkerBox.
* Represents a captured state of a ShulkerBox.
*/
-public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable {
+public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
-public interface ShulkerBox extends Container, Nameable {
+public interface ShulkerBox extends Container, Nameable, LootableInventory { // Paper
/**
* Get the {@link DyeColor} corresponding to this ShulkerBox
--
2.12.2
2.13.4