diff --git a/patches/server/0003-Gale-configuration.patch b/patches/server/0003-Gale-configuration.patch index c8ad2d5..b06e9a1 100644 --- a/patches/server/0003-Gale-configuration.patch +++ b/patches/server/0003-Gale-configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale configuration diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 06bff37e4c1fddd3be6343049a66787c63fb420c..09e8cf64d85ef7147e0106ba0c477590b6f1c534 100644 +index 06bff37e4c1fddd3be6343049a66787c63fb420c..ce257cf454300603d93ed68eb409461111bbac31 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -241,7 +241,10 @@ public class TimingsExport extends Thread { @@ -30,7 +30,7 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..09e8cf64d85ef7147e0106ba0c477590 JSONObject object = new JSONObject(); for (String key : config.getKeys(false)) { diff --git a/src/main/java/io/papermc/paper/configuration/ConfigurationPart.java b/src/main/java/io/papermc/paper/configuration/ConfigurationPart.java -index 7a4a7a654fe2516ed894a68f2657344df9d70f4c..b81dec5f603a9224e48a01d401ab262a2deb0844 100644 +index 7a4a7a654fe2516ed894a68f2657344df9d70f4c..82e6716c006492b9f24f148a918944b50231a158 100644 --- a/src/main/java/io/papermc/paper/configuration/ConfigurationPart.java +++ b/src/main/java/io/papermc/paper/configuration/ConfigurationPart.java @@ -1,6 +1,6 @@ @@ -42,7 +42,7 @@ index 7a4a7a654fe2516ed894a68f2657344df9d70f4c..b81dec5f603a9224e48a01d401ab262a public static abstract class Post extends ConfigurationPart { diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java -index c2dca89291361d60cbf160cab77749cb0130035a..ea03a1c02732a2b068686c603adcd443f05fba89 100644 +index c2dca89291361d60cbf160cab77749cb0130035a..cf6d50218769e3fecd12dbde70a03b5042feddf4 100644 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java @@ -5,7 +5,10 @@ import io.leangen.geantyref.TypeToken; @@ -110,7 +110,7 @@ index c2dca89291361d60cbf160cab77749cb0130035a..ea03a1c02732a2b068686c603adcd443 + } diff --git a/src/main/java/io/papermc/paper/configuration/InnerClassFieldDiscoverer.java b/src/main/java/io/papermc/paper/configuration/InnerClassFieldDiscoverer.java -index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..b58bbb0643dc72eba056e421d35362de855eb6f8 100644 +index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..6d19b985222d78750828fd2719c1fbf738e69a56 100644 --- a/src/main/java/io/papermc/paper/configuration/InnerClassFieldDiscoverer.java +++ b/src/main/java/io/papermc/paper/configuration/InnerClassFieldDiscoverer.java @@ -5,6 +5,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; @@ -152,7 +152,7 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..b58bbb0643dc72eba056e421d35362de } } diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -index e731de3ac158c5a4cff236c6f5001674cd488a77..b51df5d61745890faff60ea32bee754aed28b939 100644 +index e731de3ac158c5a4cff236c6f5001674cd488a77..ceef4eed87363298816426dfc19f3207be1af682 100644 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java @@ -125,13 +125,13 @@ public class PaperConfigurations extends Configurations WORLD_HEADER = map -> String.format(""" + This is a world configuration file for Gale. @@ -793,7 +793,7 @@ index 0000000000000000000000000000000000000000..e42a31422ea04243f62a5d34753d1026 +} diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java new file mode 100644 -index 0000000000000000000000000000000000000000..83b804746cce3660f4e3d1027375b052d4d7f59a +index 0000000000000000000000000000000000000000..6c20c7a9c8a4dd4957a7b3d8a10429dab0476aa2 --- /dev/null +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -0,0 +1,30 @@ @@ -829,7 +829,7 @@ index 0000000000000000000000000000000000000000..83b804746cce3660f4e3d1027375b052 +} diff --git a/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java b/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java new file mode 100644 -index 0000000000000000000000000000000000000000..f95f4166999d5b6d5363a49a181ffae618e2dce0 +index 0000000000000000000000000000000000000000..9db322100dacbf2343fbb86e3e83d99febfa9d9d --- /dev/null +++ b/src/main/java/org/galemc/gale/configuration/GaleRemovedConfigurations.java @@ -0,0 +1,13 @@ @@ -848,7 +848,7 @@ index 0000000000000000000000000000000000000000..f95f4166999d5b6d5363a49a181ffae6 +} diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java new file mode 100644 -index 0000000000000000000000000000000000000000..b2113c0ad2a7e6e19b3b981428cfc6f9df8423ac +index 0000000000000000000000000000000000000000..898f7f85ec155ce28dd4d380b4b9825582b37d34 --- /dev/null +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -0,0 +1,40 @@ @@ -894,7 +894,7 @@ index 0000000000000000000000000000000000000000..b2113c0ad2a7e6e19b3b981428cfc6f9 +} diff --git a/src/main/java/org/galemc/gale/configuration/timingsexport/GaleConfigurationTimingsExport.java b/src/main/java/org/galemc/gale/configuration/timingsexport/GaleConfigurationTimingsExport.java new file mode 100644 -index 0000000000000000000000000000000000000000..5196416daeba635b303fa553c92d0741d5fb154c +index 0000000000000000000000000000000000000000..579c2e69d8f6ce8398eb1297d1d1ead98c9068a5 --- /dev/null +++ b/src/main/java/org/galemc/gale/configuration/timingsexport/GaleConfigurationTimingsExport.java @@ -0,0 +1,19 @@