Updated Upstream (Plazma)

PlazmaMC · May 27, 2024 · 9922b84 · 9922b84
1 parent 7b82e66
commit 9922b84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -22,4 +22,4 @@ plazmaRef = dev/1.20.6
 jdkVersion = 21
 
 # Volt - Use ./gradlew updateUpstream to update this value
-plazmaCommit = 6d70d2180fe263147292d9375deef321dc40eb05
+plazmaCommit = e6586daeaa6f14a92f69d6107078b0601918fb36
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
@@ -18,18 +18,17 @@ index 6995627310de4911d87a2f93a723d6b93dc0612f..c75488ea327d72a47a08693c252b0acc
          final @Nullable Component history = this.getHistory();
 
 diff --git a/src/main/java/io/papermc/paper/ServerBrandConstants.java b/src/main/java/io/papermc/paper/ServerBrandConstants.java
-index b085cb9b49f2b6b1ad72448959d57a5a7b1f1f21..c4e9f8590b2acc0cd223810ed5ade7b660d3dbb1 100644
+index af534fb15be2be3e5b4258c522e0e6c967c2bb1c..b0db5312d4f02b9a1edb443c76c171247e8088f9 100644
 --- a/src/main/java/io/papermc/paper/ServerBrandConstants.java
 +++ b/src/main/java/io/papermc/paper/ServerBrandConstants.java
-@@ -2,21 +2,24 @@ package io.papermc.paper;
+@@ -4,19 +4,23 @@ import org.jetbrains.annotations.Nullable;
 
- import org.jetbrains.annotations.Nullable;
-
-+// Thunderbolt start - Rebranding
  public enum ServerBrandConstants {;
 
++    // Thunderbolt start - Rebranding
++
      // Basic brand informations
--    protected static final String BRAND_NAME = "Plazma";
+-    public static final String BRAND_NAME = "Plazma";
 -    public static final String RESOURCE_PATH = "META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties";
 +    protected static final String BRAND_NAME = "Thunderbolt";
 +    public static final String RESOURCE_PATH = "META-INF/maven/org.plazmamc.thunderbolt/thunderbolt-api/pom.properties";
@@ -55,16 +54,14 @@ index b085cb9b49f2b6b1ad72448959d57a5a7b1f1f21..c4e9f8590b2acc0cd223810ed5ade7b6
          """;
 
      // Support URLs
-@@ -24,10 +27,11 @@ public enum ServerBrandConstants {;
+@@ -24,7 +28,9 @@ public enum ServerBrandConstants {;
      public static final String CONFIG_REFERENCE = "https://docs.plazmamc.org/plazma/administration/reference/configurations";
      public static final String START_GUIDE = "https://docs.plazmamc.org/plazma/administration/getting-started";
      public static final String USAGE_GUIDE = "https://docs.plazmamc.org/plazma/administration/getting-started/next-step";
 -    public static final String SUPPORT_PAGE = "https://github.com/PlazmaMC/Plazma/issues";
 +    public static final String SUPPORT_PAGE = "https://github.com/PlazmaMC/Thunderbolt/issues";
++
++    // Thunderbolt end - Rebranding
 
      // DO NOT MODIFY BELOW
      public static final String BRAND_LCASE = BRAND_NAME.toLowerCase();
-     public static final String BRAND_UCASE = BRAND_NAME.toUpperCase();
-
- }
-+// Thunderbolt end - Rebranding
diff --git a/patches/server/0002-Configurable-Thunderbolt.patch b/patches/server/0002-Configurable-Thunderbolt.patch
@@ -95,10 +95,10 @@ index 15548aac320ae6d707cab4a61dfc99eaebb06634..873ef80c02b4c6494529a6327faf8290
          );
          // Plazma end - Configurable Plazma
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 16531bcbdfe80c7e3d553aa6fce576588e2e3b0e..77ebd33eca98832e34866e7b522a263673fa25f8 100644
+index a2ffd16c9351c484f0163f19f9352cd643f9b437..cfcf196ca87c8eb15e2abf8ef876eb8db968df5f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -174,6 +174,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -175,6 +175,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return this.plazmaConfig;
      }
      // Plazma end - Configurable Plazma
@@ -111,7 +111,7 @@ index 16531bcbdfe80c7e3d553aa6fce576588e2e3b0e..77ebd33eca98832e34866e7b522a2636
 
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
      public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
-@@ -272,12 +278,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -273,12 +279,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          org.bukkit.World.Environment env,
          java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator,
          java.util.function.Function<org.spigotmc.SpigotWorldConfig, org.plazmamc.plazma.configurations.WorldConfigurations> plazmaWorldConfigurationCreator,
@@ -153,7 +153,7 @@ index 24b8c2dfb41e97adee90849d56f13583b6cafcc0..8f08c22b93367b5d330356e727d4ab24
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f84266bca823be3fe7d26ac59b181424e1e307ef..58123df202b28de77a9e733e062ee4f201d4d305 100644
+index 24c3914ba4f144a2e43c17e98373b7a4ce1f6217..42456bb160378f78ca898d825880b77013835163 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -205,6 +205,14 @@ public class Main {