mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Shade in missing rhino script engine
This commit is contained in:
William Blake Galbreath
@@ -1,21 +1,21 @@
|
||||
From 38ec69b8af0c07ed01d1cf85a8580f4677be88d8 Mon Sep 17 00:00:00 2001
|
||||
From 8b918322cf149de46b4bb4b793ce6daa5ca3fe56 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 4 May 2019 01:02:11 -0500
|
||||
Subject: [PATCH] Rebrand
|
||||
|
||||
---
|
||||
pom.xml | 18 +--
|
||||
pom.xml | 32 +++--
|
||||
.../paper/console/PaperConsole.java | 2 +-
|
||||
.../net/minecraft/server/MinecraftServer.java | 2 +-
|
||||
.../net/pl3x/purpur/PurpurVersionFetcher.java | 115 ++++++++++++++++++
|
||||
.../org/bukkit/craftbukkit/CraftServer.java | 2 +-
|
||||
.../craftbukkit/util/CraftMagicNumbers.java | 2 +-
|
||||
.../bukkit/craftbukkit/util/Versioning.java | 2 +-
|
||||
7 files changed, 129 insertions(+), 14 deletions(-)
|
||||
7 files changed, 143 insertions(+), 14 deletions(-)
|
||||
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 55679af92..e6fc4d014 100644
|
||||
index 55679af926..a7ee9396a0 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -1,11 +1,11 @@
|
||||
@@ -54,7 +54,28 @@ index 55679af92..e6fc4d014 100644
|
||||
<version>${project.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
@@ -143,7 +143,7 @@
|
||||
@@ -40,6 +40,20 @@
|
||||
<version>${minecraft.version}-SNAPSHOT</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
+ <!-- Purpur start -->
|
||||
+ <dependency>
|
||||
+ <groupId>org.mozilla</groupId>
|
||||
+ <artifactId>rhino</artifactId>
|
||||
+ <version>1.7.7.1</version>
|
||||
+ <scope>compile</scope>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>cat.inspiracio</groupId>
|
||||
+ <artifactId>rhino-js-engine</artifactId>
|
||||
+ <version>1.7.7.1</version>
|
||||
+ <scope>compile</scope>
|
||||
+ </dependency>
|
||||
+ <!-- Purpur end -->
|
||||
<dependency>
|
||||
<groupId>net.minecrell</groupId>
|
||||
<artifactId>terminalconsoleappender</artifactId>
|
||||
@@ -143,7 +157,7 @@
|
||||
|
||||
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
||||
<build>
|
||||
@@ -63,7 +84,7 @@ index 55679af92..e6fc4d014 100644
|
||||
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
|
||||
<plugins>
|
||||
<plugin>
|
||||
@@ -151,7 +151,7 @@
|
||||
@@ -151,7 +165,7 @@
|
||||
<artifactId>gitdescribe-maven-plugin</artifactId>
|
||||
<version>1.3</version>
|
||||
<configuration>
|
||||
@@ -73,7 +94,7 @@ index 55679af92..e6fc4d014 100644
|
||||
</configuration>
|
||||
<executions>
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
index cd6e25923..bb227bc0f 100644
|
||||
index cd6e259239..bb227bc0fb 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
|
||||
@@ -86,7 +107,7 @@ index cd6e25923..bb227bc0f 100644
|
||||
);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 346664cee..ac45dbf59 100644
|
||||
index c9deaffc4a..b31a9ac78c 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1484,7 +1484,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -100,7 +121,7 @@ index 346664cee..ac45dbf59 100644
|
||||
public CrashReport b(CrashReport crashreport) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||
new file mode 100644
|
||||
index 000000000..d8b408f06
|
||||
index 0000000000..d8b408f061
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||
@@ -0,0 +1,115 @@
|
||||
@@ -220,7 +241,7 @@ index 000000000..d8b408f06
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b7dfda265..fc074a66c 100644
|
||||
index b9a398bc57..f70468adab 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper
|
||||
@@ -233,7 +254,7 @@ index b7dfda265..fc074a66c 100644
|
||||
private final String bukkitVersion = Versioning.getBukkitVersion();
|
||||
private final Logger logger = Logger.getLogger("Minecraft");
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
index 770375ed4..0e5da2a30 100644
|
||||
index 770375ed42..0e5da2a30d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||||
@@ -246,7 +267,7 @@ index 770375ed4..0e5da2a30 100644
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
||||
index 674096cab..e9aee2d8a 100644
|
||||
index 674096cab1..e9aee2d8a9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
||||
@@ -11,7 +11,7 @@ public final class Versioning {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4ad6d822049616c83833585f1a24cbe87500128a Mon Sep 17 00:00:00 2001
|
||||
From c794d57af4283d31fe962cea6c96a3602c0e50fd Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Fri, 14 Dec 2018 21:53:58 -0800
|
||||
Subject: [PATCH] Tuinity Server Patches
|
||||
@@ -128,7 +128,7 @@ Subject: [PATCH] Tuinity Server Patches
|
||||
create mode 100644 src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e6fc4d014e..ffac75de25 100644
|
||||
index a7ee9396a0..90ca354c46 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -148,7 +148,7 @@ index e6fc4d014e..ffac75de25 100644
|
||||
</properties>
|
||||
|
||||
<parent>
|
||||
@@ -119,6 +119,12 @@
|
||||
@@ -133,6 +133,12 @@
|
||||
<version>1.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
@@ -161,7 +161,7 @@ index e6fc4d014e..ffac75de25 100644
|
||||
</dependencies>
|
||||
|
||||
<repositories>
|
||||
@@ -282,6 +288,10 @@
|
||||
@@ -296,6 +302,10 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 68cbef2dfe772d700b94d9a60e70b38fe91b2c96 Mon Sep 17 00:00:00 2001
|
||||
From 86ffbf216985518a0de899945c8ee73015222f62 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Wed, 22 Jan 2020 20:13:40 -0600
|
||||
Subject: [PATCH] UPnP Port Forwarding Service
|
||||
@@ -14,11 +14,11 @@ Subject: [PATCH] UPnP Port Forwarding Service
|
||||
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index ffac75de25..a4c2765aa6 100644
|
||||
index 90ca354c46..e8c0974b64 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -94,6 +94,12 @@
|
||||
<version>1.1.1</version>
|
||||
@@ -53,6 +53,12 @@
|
||||
<version>1.7.7.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
+ <dependency>
|
||||
@@ -27,10 +27,10 @@ index ffac75de25..a4c2765aa6 100644
|
||||
+ <version>1.0</version>
|
||||
+ <scope>compile</scope>
|
||||
+ </dependency>
|
||||
<!-- Purpur end -->
|
||||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
<artifactId>sqlite-jdbc</artifactId>
|
||||
@@ -138,6 +144,10 @@
|
||||
<groupId>net.minecrell</groupId>
|
||||
@@ -152,6 +158,10 @@
|
||||
<id>spigotmc-public</id>
|
||||
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
||||
</repository>
|
||||
|
||||
Reference in New Issue
Block a user