Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update silk touch patch to use minimessage

Browse Source
This commit is contained in:
William Blake Galbreath
2021-09-02 15:17:12 -05:00
parent 8c2e417757
commit c28262576c
174 changed files with 656 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0004-Purpur-config-files.patch
View File

@@ -30,7 +30,7 @@ index f5d01bce4d5547b4aeca96b7962b2090f47ea541..05f1b6d103ec20f196b60944f5bc0073
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index da67fb1d6c6719e757ad600fe5ea36e9e18b1325..3781e7c23347a5860c448a94bd01cb90979d9d4a 100644
index 9364b58d2dc9ab199ac4303806a799d158e3fbe4..5cb4635690efd400853ab6378886642dd3bf2983 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -123,7 +123,7 @@ index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..4c55bb04ff41fabb47c6477ba33e0e0a
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af37f7f60b8
index 0000000000000000000000000000000000000000..963ef9cf4dc134f5311420edd8c851eab34af3e2
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,159 @@
@@ -190,8 +190,8 @@ index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af3
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 20);
+ set("config-version", 20);
+ version = getInt("config-version", 21);
+ set("config-version", 21);
+
+ readConfig(PurpurConfig.class, null);
+ }
@@ -288,10 +288,10 @@ index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af3
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..683ee20f08eac69238bea33021e35b1838c44a8b
index 0000000000000000000000000000000000000000..8bc89d48695c816a1db77f9cdffd05f35afea92a
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,95 @@
@@ -0,0 +1,96 @@
+package net.pl3x.purpur;
+
+import net.minecraft.core.Registry;
@@ -310,6 +310,7 @@ index 0000000000000000000000000000000000000000..683ee20f08eac69238bea33021e35b18
+import net.pl3x.purpur.tool.Waxable;
+import net.pl3x.purpur.tool.Weatherable;
+import org.apache.commons.lang.BooleanUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+