mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Missed an important rebrand spot
This commit is contained in:
@@ -1,21 +1,21 @@
|
|||||||
From d8265c1939a992ff975a7d259bf3e60abec03067 Mon Sep 17 00:00:00 2001
|
From 3a3464e136495567803d13620ab7fe5fe349b291 Mon Sep 17 00:00:00 2001
|
||||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||||
Date: Sat, 4 May 2019 01:02:11 -0500
|
Date: Sat, 4 May 2019 01:02:11 -0500
|
||||||
Subject: [PATCH] Rebrand
|
Subject: [PATCH] Rebrand
|
||||||
|
|
||||||
---
|
---
|
||||||
pom.xml | 31 +++--
|
pom.xml | 33 +++--
|
||||||
.../paper/console/PaperConsole.java | 2 +-
|
.../paper/console/PaperConsole.java | 2 +-
|
||||||
.../net/minecraft/server/MinecraftServer.java | 2 +-
|
.../net/minecraft/server/MinecraftServer.java | 2 +-
|
||||||
.../net/pl3x/purpur/PurpurVersionFetcher.java | 115 ++++++++++++++++++
|
.../net/pl3x/purpur/PurpurVersionFetcher.java | 115 ++++++++++++++++++
|
||||||
.../org/bukkit/craftbukkit/CraftServer.java | 2 +-
|
.../org/bukkit/craftbukkit/CraftServer.java | 2 +-
|
||||||
.../craftbukkit/util/CraftMagicNumbers.java | 2 +-
|
.../craftbukkit/util/CraftMagicNumbers.java | 2 +-
|
||||||
.../bukkit/craftbukkit/util/Versioning.java | 2 +-
|
.../bukkit/craftbukkit/util/Versioning.java | 2 +-
|
||||||
7 files changed, 142 insertions(+), 14 deletions(-)
|
7 files changed, 143 insertions(+), 15 deletions(-)
|
||||||
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index ef8ee637a..97c73571b 100644
|
index ef8ee637a8..8044fa0740 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -1,12 +1,11 @@
|
@@ -1,12 +1,11 @@
|
||||||
@@ -85,8 +85,17 @@ index ef8ee637a..97c73571b 100644
|
|||||||
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
|
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@@ -172,7 +185,7 @@
|
||||||
|
<artifactId>gitdescribe-maven-plugin</artifactId>
|
||||||
|
<version>1.3</version>
|
||||||
|
<configuration>
|
||||||
|
- <outputPrefix>git-Paper-</outputPrefix>
|
||||||
|
+ <outputPrefix>git-Purpur-</outputPrefix>
|
||||||
|
<scmDirectory>..</scmDirectory>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||||
index 74ed02fa9..c1280478e 100644
|
index 74ed02fa92..c1280478ee 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||||
+++ b/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 {
|
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
|
||||||
@@ -99,7 +108,7 @@ index 74ed02fa9..c1280478e 100644
|
|||||||
.completer(new ConsoleCommandCompleter(this.server))
|
.completer(new ConsoleCommandCompleter(this.server))
|
||||||
);
|
);
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 5c862de2f..0d0998b06 100644
|
index d8d11ed962..bfdff5c96d 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1446,7 +1446,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@@ -1446,7 +1446,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||||
@@ -113,7 +122,7 @@ index 5c862de2f..0d0998b06 100644
|
|||||||
public CrashReport b(CrashReport crashreport) {
|
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
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..d8b408f06
|
index 0000000000..d8b408f061
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
|
||||||
@@ -0,0 +1,115 @@
|
@@ -0,0 +1,115 @@
|
||||||
@@ -233,7 +242,7 @@ index 000000000..d8b408f06
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 25e012678..1026fd81b 100644
|
index 25e0126788..1026fd81b7 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
|
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
|
||||||
@@ -246,7 +255,7 @@ index 25e012678..1026fd81b 100644
|
|||||||
private final String bukkitVersion = Versioning.getBukkitVersion();
|
private final String bukkitVersion = Versioning.getBukkitVersion();
|
||||||
private final Logger logger = Logger.getLogger("Minecraft");
|
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
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
index 257f46003..63db398ec 100644
|
index 257f46003f..63db398ecb 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
@@ -317,7 +317,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
@@ -317,7 +317,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||||||
@@ -259,7 +268,7 @@ index 257f46003..63db398ec 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
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
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
|
||||||
+++ b/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 {
|
@@ -11,7 +11,7 @@ public final class Versioning {
|
||||||
|
|||||||
Reference in New Issue
Block a user