From 965bbdd8fb3744d03ea7c9633ce44811d34d3162 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 3 Oct 2018 21:18:47 -0400 Subject: [PATCH] [CI-SKIP] Remove Trove and update to fastutul 8 on -api These deps were marked as provided, not compile, so they were never exposed to plugins anyways as we THOUGHT we had done, oops. Well plugins can still add fastutil to their build and use the deps as provided by minecraft. This ensures -api side does not use a deprecated API as fastutil 8 removed the deprecated methods. --- .../Add-FastUtil-to-Bukkit.patch | 25 +++++++++++++++ ...low-plugins-to-use-SLF4J-for-logging.patch | 4 +-- .../Use-ASM-for-event-executors.patch | 18 +++++------ .../add-Trove-and-FastUtil-to-Bukkit.patch | 31 ------------------- 4 files changed, 36 insertions(+), 42 deletions(-) create mode 100644 Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch delete mode 100644 Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch diff --git a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch new file mode 100644 index 0000000000..a36666b042 --- /dev/null +++ b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Fri, 1 Apr 2016 00:02:47 -0400 +Subject: [PATCH] Add FastUtil to Bukkit + +Doesn't expose to plugins, just allows Paper-API to use it for optimization + +diff --git a/pom.xml b/pom.xml +index 2a5846a18..b5cc156cd 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -0,0 +0,0 @@ + + + ++ ++ it.unimi.dsi ++ fastutil ++ 8.2.2 ++ provided ++ + + commons-lang + commons-lang +-- \ No newline at end of file diff --git a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch index 63c609d8f4..43f0208a29 100644 --- a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index ffedf2e7..67d40f03 100644 +index 7ca5363b3..5fd948719 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ @@ -33,7 +33,7 @@ index ffedf2e7..67d40f03 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index 55debf5d..8d2999ac 100644 +index 55debf5d5..8d2999ace 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -0,0 +0,0 @@ public interface Plugin extends TabExecutor { diff --git a/Spigot-API-Patches/Use-ASM-for-event-executors.patch b/Spigot-API-Patches/Use-ASM-for-event-executors.patch index 73ac80aac2..55dc3323d5 100644 --- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index d6cf92d1..ffedf2e7 100644 +index b5cc156cd..310c30bb6 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ @@ -29,7 +29,7 @@ index d6cf92d1..ffedf2e7 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 00000000..9ff99e3b +index 000000000..9ff99e3b3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +0,0 @@ @@ -75,7 +75,7 @@ index 00000000..9ff99e3b +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 00000000..f60f0100 +index 000000000..f60f01005 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +0,0 @@ @@ -120,7 +120,7 @@ index 00000000..f60f0100 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 00000000..140cf0ad +index 000000000..140cf0ad3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +0,0 @@ @@ -170,7 +170,7 @@ index 00000000..140cf0ad +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 00000000..6941d9fb +index 000000000..6941d9fbf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +0,0 @@ @@ -208,7 +208,7 @@ index 00000000..6941d9fb +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 00000000..1473ff8c +index 000000000..1473ff8cd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +0,0 @@ @@ -277,7 +277,7 @@ index 00000000..1473ff8c +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 00000000..62acbf82 +index 000000000..62acbf821 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +0,0 @@ @@ -315,7 +315,7 @@ index 00000000..62acbf82 + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index 3b2c99ea..b45b6c1c 100644 +index 3b2c99ea7..b45b6c1c3 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -0,0 +0,0 @@ import org.bukkit.event.Event; @@ -401,7 +401,7 @@ index 3b2c99ea..b45b6c1c 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 3af99b5b..72d506d1 100644 +index 3af99b5bd..72d506d1f 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch deleted file mode 100644 index 7035c64768..0000000000 --- a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 1 Apr 2016 00:02:47 -0400 -Subject: [PATCH] add Trove and FastUtil to Bukkit - - -diff --git a/pom.xml b/pom.xml -index 2a5846a1..d6cf92d1 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -0,0 +0,0 @@ - - - -+ -+ net.sf.trove4j -+ trove4j -+ 3.0.3 -+ -+ provided -+ -+ -+ co.aikar -+ fastutil-lite -+ 1.0 -+ provided -+ - - commons-lang - commons-lang --- \ No newline at end of file