Update Upstream (Folia)

Upstream has released updates that appear to apply and compile correctly

Folia Changes :
PaperMC/Folia@7aacf90 Update Paper

gradle.properties

@@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc
 version = 1.20.2-R0.1-SNAPSHOT
 mcVersion = 1.20.2
 
-foliaRef = 757cb09c41e5a8eb10dc5b23e5959369fd1fbe86
+foliaRef = 7aacf902b0fc917b2874a67f4ebc77077936355d
 
 org.gradle.caching=true
 org.gradle.parallel=false

patches/api/0001-TenseiMC-Config-Files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] TenseiMC Config Files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b6a8217b97842cd07af24fadb21e0e44226e5bb9..41bf1e46762db4a56bf04f6a62a909c0c04b4c43 100644
+index 85b169c04f44431363d4e14d4857140f160ceace..d56ce86527179537e7c92ba8d8fbbdd68b1b662c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2190,6 +2190,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/api/0002-Purpur-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 41bf1e46762db4a56bf04f6a62a909c0c04b4c43..73f79b1d5413c4ed82f68bf0d48f84c27ec8e52e 100644
+index d56ce86527179537e7c92ba8d8fbbdd68b1b662c..696608b24cc96113ad7e474deecca2efa005bd25 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2126,6 +2126,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2195,6 +2195,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          public org.bukkit.configuration.file.YamlConfiguration getTenseiConfig()  {
              throw new UnsupportedOperationException("Not supported yet");
          }

patches/api/0004-Added-the-ability-to-add-combustible-items.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 26b32a5935aaed9b1fe356af0208a778144aac87..d62c1421099610473cd06bf7ca369978133bcb9a 100644
+index b7e1c8bd8dd38e1a9e74925740b22dad61a75f49..5a652f427b01b62d1af458f97b090cea7f52519b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2764,4 +2764,25 @@ public final class Bukkit {
+@@ -2840,4 +2840,25 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -35,10 +35,10 @@ index 26b32a5935aaed9b1fe356af0208a778144aac87..d62c1421099610473cd06bf7ca369978
 +    // TenseiMC end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 73f79b1d5413c4ed82f68bf0d48f84c27ec8e52e..614f97f8471e66f582f839d5a26a0ad8eb24199a 100644
+index 696608b24cc96113ad7e474deecca2efa005bd25..10f026e8219f30514d45ca118708eb4a0194b4da 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2427,4 +2427,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2496,4 +2496,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      public boolean isGlobalTickThread();
      // Folia end - region threading API

patches/api/0005-More-API-Enchantment.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] More API Enchantment
 
 
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index 4cfe8501368f601fdd4203570f4e6a8f6f9685e6..42532a1c3d04fda91fbd208f28dcf8f8b6ec6831 100644
+index 8183f26545998e076ad93b4e28f3a3ff693d1032..fb58c31fcd4fd618ac51a497cfcc1ab9b74eeee2 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -408,6 +408,15 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat
+@@ -432,6 +432,15 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat
          acceptingNew = false;
      }
 
@@ -24,7 +24,7 @@ index 4cfe8501368f601fdd4203570f4e6a8f6f9685e6..42532a1c3d04fda91fbd208f28dcf8f8
      /**
       * Gets the Enchantment at the specified key
       *
-@@ -443,4 +452,21 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat
+@@ -467,4 +476,21 @@ public abstract class Enchantment implements Keyed, net.kyori.adventure.translat
      public static Enchantment[] values() {
          return byName.values().toArray(new Enchantment[byName.size()]);
      }
@@ -47,10 +47,10 @@ index 4cfe8501368f601fdd4203570f4e6a8f6f9685e6..42532a1c3d04fda91fbd208f28dcf8f8
 +    // TenseiMC end
  }
 diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
-index 5f42a9c0c43ced10b754170d7c83793a99fce81b..53b89d0b3fa46591159687f5cef97ac90ece319c 100644
+index 4a838d6eab5a17d7204dba96a882b6c5a22636fc..e2a115be11b39893c2d76e8a0aa2d7315c42c140 100644
 --- a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
 +++ b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
-@@ -102,4 +102,15 @@ public class EnchantmentWrapper extends Enchantment {
+@@ -112,4 +112,15 @@ public class EnchantmentWrapper extends Enchantment {
          return getEnchantment().getActiveSlots();
      }
      // Paper end

patches/api/0006-Method-Custom-WorldBorder-Player.patch

@@ -17,10 +17,10 @@ index 0000000000000000000000000000000000000000..426a6780c125e3d6be1f79974dfa3d55
 +    BLUE, RED, GREEN;
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 20fa1024f9ad8f478a347be5c554b5e45b398a1c..8d23f60ccb13820dec989e610fbbe878d3d35b30 100644
+index 9240ea09206461d61cc08d4252e8507555bf41cf..8658c4be68059ff4752e2e368ba7f72b9eaec22b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2309,6 +2309,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2306,6 +2306,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setWorldBorder(@Nullable WorldBorder border);
 

patches/api/0007-Method-Update-Chunk-Client.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Method Update Chunk Client
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d23f60ccb13820dec989e610fbbe878d3d35b30..6b218bc786fa05080066c6c4ee14eae278dabcec 100644
+index 8658c4be68059ff4752e2e368ba7f72b9eaec22b..68e41ed748188581ef3c2fb7ec3fbb1a1348fdab 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2321,6 +2321,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2318,6 +2318,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @org.jetbrains.annotations.ApiStatus.Experimental
      public void setOwnWorldBorder(@NotNull Location centerBorder, @NotNull fr.euphilia.utils.BorderColor colorBorder, double borderSize, int warningBlocks, int warningTime);

patches/server/0001-Rebranding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b62a25bd32b7976dd00f53521d0e050d60c34ca7..167c0c0f2a2d1cb8658bca7886c448198f4503f1 100644
+index a748157d6ce9c088ed3c663d9ddd6f5c2d82b6d8..5ac001438f997793a22d45444976c7729ad90843 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -121,7 +121,7 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e720d7f098a619a65b18f55a785ffbe4
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..b62137def6ac3826eb5d9e367d97579b32fe01d2 100644
+index 4b189b54c8f326939a7b9ffdfb35edfb7d8cee63..87835b23e8e58b310da972c76dd620ac5908903e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1833,7 +1833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -134,10 +134,10 @@ index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..b62137def6ac3826eb5d9e367d97579b
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a50a9ffda4875061fb8840873115119f334f0519..eb302567a5e6e83ad64547445e0d9e058aacccdc 100644
+index 4b43134f38ba203a309a412055461b57934da8f9..efc20a7fa1b81c16fbc96f1a00c0eda2f814649e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
+@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {

patches/server/0002-TenseiMC-Config-Files.patch

@@ -216,7 +216,7 @@ index 0000000000000000000000000000000000000000..7c20367b93416b5434bdc29556aeafb2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a9fe3d1c0fc217bd32e884c9e75c906d8b4bf967..e0caf166ee7888e9a9358fb01736b0eb2ffc0be4 100644
+index 50fd7b0299397e8b1d35f263205c999fb756f545..85ca1e906579ccabece996431be59817be09efd2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -218,6 +218,14 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -235,7 +235,7 @@ index a9fe3d1c0fc217bd32e884c9e75c906d8b4bf967..e0caf166ee7888e9a9358fb01736b0eb
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0ff6764c747ee6258ab9d722b48c24f0ddb2afdf..676293d6977d2403df70a4d26a1a34bbf7c2470a 100644
+index c58ca3dd28b9c113a26feb1a7f05bd78c0dbd678..c9cb15018bc84292d931ce7e99f0aba40d0e899b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -166,6 +166,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -255,26 +255,26 @@ index 0ff6764c747ee6258ab9d722b48c24f0ddb2afdf..676293d6977d2403df70a4d26a1a34bb
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb302567a5e6e83ad64547445e0d9e058aacccdc..87a057b94b9743acbb8aaeda7f35528de6ecb93e 100644
+index efc20a7fa1b81c16fbc96f1a00c0eda2f814649e..8edf5dc6a997a2752605af5e161e20fba26d7ad9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1080,6 +1080,7 @@ public final class CraftServer implements Server {
+@@ -1082,6 +1082,7 @@ public final class CraftServer implements Server {
 
-         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
+         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
 +        fr.euphilia.tenseimc.TenseiConfig.init((File) console.options.valueOf("tenseimc-settings")); // TenseiMC
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1095,6 +1096,7 @@ public final class CraftServer implements Server {
+@@ -1097,6 +1098,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
 +            world.tenseiWorldConfig.init(); // TenseiMC
          }
 
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2957,6 +2959,14 @@ public final class CraftServer implements Server {
+@@ -3021,6 +3023,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -290,7 +290,7 @@ index eb302567a5e6e83ad64547445e0d9e058aacccdc..87a057b94b9743acbb8aaeda7f35528d
          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 e4cacb17f56c618bef19e1165c07aac86af61150..266122ad86855de1b9e7c50b528637831376ac7e 100644
+index 2af0068ef338634d1f44532af5db66c2d0b3dd10..399daebe38ef5d9afa6d648f4ed9ee0d52a8f1d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -173,6 +173,14 @@ public class Main {

patches/server/0003-Purpur-config-files.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e0caf166ee7888e9a9358fb01736b0eb2ffc0be4..faf0630c878504cda550e606c6f4ccef9494e0ec 100644
+index 85ca1e906579ccabece996431be59817be09efd2..20a323d7335cd13226c2d5ffd5ee1051a50d6c9d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -221,10 +221,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -22,7 +22,7 @@ index e0caf166ee7888e9a9358fb01736b0eb2ffc0be4..faf0630c878504cda550e606c6f4ccef
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 676293d6977d2403df70a4d26a1a34bbf7c2470a..f2d3109eb7d5cda318d568e074c82e47ce44fb3a 100644
+index c9cb15018bc84292d931ce7e99f0aba40d0e899b..cc86a3650d130ea5d08983e4f37f08328a4c39cb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -42,34 +42,34 @@ index 676293d6977d2403df70a4d26a1a34bbf7c2470a..f2d3109eb7d5cda318d568e074c82e47
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 87a057b94b9743acbb8aaeda7f35528de6ecb93e..945629f5cb74d180b7eab61c550f90b2ffe77408 100644
+index 8edf5dc6a997a2752605af5e161e20fba26d7ad9..92809ef69b80a69f83e61f9aa0d26e54402a6f80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1081,6 +1081,7 @@ public final class CraftServer implements Server {
-         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
+@@ -1083,6 +1083,7 @@ public final class CraftServer implements Server {
+         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          fr.euphilia.tenseimc.TenseiConfig.init((File) console.options.valueOf("tenseimc-settings")); // TenseiMC
 +        org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // TenseiMC - Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1097,6 +1098,7 @@ public final class CraftServer implements Server {
+@@ -1099,6 +1100,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.tenseiWorldConfig.init(); // TenseiMC
 +            world.purpurConfig.init(); // TenseiMC - Purpur
          }
 
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1112,6 +1114,7 @@ public final class CraftServer implements Server {
+@@ -1114,6 +1116,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
 +        org.purpurmc.purpur.PurpurConfig.registerCommands(); // TenseiMC - Purpur
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
-@@ -2965,6 +2968,15 @@ public final class CraftServer implements Server {
+@@ -3029,6 +3032,15 @@ public final class CraftServer implements Server {
              return fr.euphilia.tenseimc.TenseiConfig.config;
          }
 
@@ -86,7 +86,7 @@ index 87a057b94b9743acbb8aaeda7f35528de6ecb93e..945629f5cb74d180b7eab61c550f90b2
 
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 266122ad86855de1b9e7c50b528637831376ac7e..b3e9f339249d0a0af9e5e162b8b4d834a456a43f 100644
+index 399daebe38ef5d9afa6d648f4ed9ee0d52a8f1d9..e84468716def70777addbf0fd2a7bb3747e47a7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -179,6 +179,12 @@ public class Main {