Merge pull request #4 from Euphillya/purpur-config : Remove duplicate…

…s of Purpur and TenseiMC in favor of Purpur. MAKE A BACKUP! If you have any problems, please let me know on Discord or Github!
Euphillya · Nov 20, 2023 · ae3ad78 · ae3ad78
2 parents 32b135c + 2680145
commit ae3ad78
Show file tree

Hide file tree

Showing 54 changed files with 1,580 additions and 603 deletions.
diff --git a/gradle.properties b/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

diff --git a/patches/api/0001-TenseiMC-Config-Files.patch b/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
 

diff --git a/patches/api/0002-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bierque Jason <bierquejason@gmail.com>
+Date: Thu, 2 Nov 2023 15:36:16 +0100
+Subject: [PATCH] Purpur config files
+
+
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index d56ce86527179537e7c92ba8d8fbbdd68b1b662c..696608b24cc96113ad7e474deecca2efa005bd25 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -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");
+         }
++
++        @NotNull
++        public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig()  {
++            throw new UnsupportedOperationException("Not supported yet");
++        }
++
++        @NotNull
++        public java.util.Properties getServerProperties()  {
++            throw new UnsupportedOperationException("Not supported yet");
++        }
+         // TenseiMC end
+
+         /**
diff --git a/...002-Purpur-Allow-Inventory-Resizing.patch → ...003-Purpur-Allow-Inventory-Resizing.patch b/...002-Purpur-Allow-Inventory-Resizing.patch → ...003-Purpur-Allow-Inventory-Resizing.patch
diff --git a/...he-ability-to-add-combustible-items.patch → ...he-ability-to-add-combustible-items.patch b/...he-ability-to-add-combustible-items.patch → ...he-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 41bf1e46762db4a56bf04f6a62a909c0c04b4c43..e137d960436715c0b650ca8f9af3a4666787b9ed 100644
+index 696608b24cc96113ad7e474deecca2efa005bd25..10f026e8219f30514d45ca118708eb4a0194b4da 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2417,4 +2417,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

diff --git a/patches/api/0004-More-API-Enchantment.patch → patches/api/0005-More-API-Enchantment.patch b/patches/api/0004-More-API-Enchantment.patch → 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

diff --git a/...05-Method-Custom-WorldBorder-Player.patch → ...06-Method-Custom-WorldBorder-Player.patch b/...05-Method-Custom-WorldBorder-Player.patch → ...06-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);
 

diff --git a/...api/0006-Method-Update-Chunk-Client.patch → ...api/0007-Method-Update-Chunk-Client.patch b/...api/0006-Method-Update-Chunk-Client.patch → ...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);

diff --git a/...ur-PlayerSetSpawnerTypeWithEggEvent.patch → ...ur-PlayerSetSpawnerTypeWithEggEvent.patch b/...ur-PlayerSetSpawnerTypeWithEggEvent.patch → ...ur-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/...api/0008-Purpur-ExecuteCommandEvent.patch → ...api/0009-Purpur-ExecuteCommandEvent.patch b/...api/0008-Purpur-ExecuteCommandEvent.patch → ...api/0009-Purpur-ExecuteCommandEvent.patch
diff --git a/patches/api/0009-Purpur-Anvil-API.patch → patches/api/0010-Purpur-Anvil-API.patch b/patches/api/0009-Purpur-Anvil-API.patch → patches/api/0010-Purpur-Anvil-API.patch
diff --git a/patches/api/0010-Default-Permissions.patch → patches/api/0011-Default-Permissions.patch b/patches/api/0010-Default-Permissions.patch → patches/api/0011-Default-Permissions.patch
diff --git a/.../0011-Purpur-EnderChest-1-to-6-Rows.patch → .../0012-Purpur-EnderChest-1-to-6-Rows.patch b/.../0011-Purpur-EnderChest-1-to-6-Rows.patch → .../0012-Purpur-EnderChest-1-to-6-Rows.patch
diff --git a/...ayer-join-full-server-by-permission.patch → ...ayer-join-full-server-by-permission.patch b/...ayer-join-full-server-by-permission.patch → ...ayer-join-full-server-by-permission.patch
diff --git a/patches/server/0001-Folia-Pull-Request-Pending-validation.patch b/patches/server/0001-Folia-Pull-Request-Pending-validation.patch
diff --git a/patches/server/0002-Rebranding.patch → patches/server/0001-Rebranding.patch b/patches/server/0002-Rebranding.patch → 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 68fa7b36250aa7656f4f553e20e61fbec22097d0..5ff32e5500fecd4c87ef34a2afb2ab11891cb3f3 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 {

diff --git a/...s/server/0003-TenseiMC-Config-Files.patch → ...s/server/0002-TenseiMC-Config-Files.patch b/...s/server/0003-TenseiMC-Config-Files.patch → ...s/server/0002-TenseiMC-Config-Files.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] TenseiMC Config Files
 
 diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4bc8c7f69c94be174c5385c3b8ed64670b7e673d
+index 0000000000000000000000000000000000000000..2cdfb1b060878189ca00923e50574849adb983b8
 --- /dev/null
 +++ b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,129 @@
 +package fr.euphilia.tenseimc;
 +
 +import com.google.common.base.Throwables;
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..4bc8c7f69c94be174c5385c3b8ed6467
 +public class TenseiConfig {
 +
 +    public static YamlConfiguration config;
-+    private static int version;
++    public static int version;
 +    private static boolean verbose;
 +    private static File CONFIG_FILE;
 +
@@ -49,7 +49,8 @@ index 0000000000000000000000000000000000000000..4bc8c7f69c94be174c5385c3b8ed6467
 +        config.options().copyDefaults(true);
 +        verbose = getBoolean("verbose", false);
 +
-+        version = getInt("config-version", 1);
++        version = getInt("config-version", 2);
++        set("config-version", 2);
 +
 +        readConfig(TenseiConfig.class, null);
 +    }
@@ -133,13 +134,17 @@ index 0000000000000000000000000000000000000000..4bc8c7f69c94be174c5385c3b8ed6467
 +        }
 +        return builder.build();
 +    }
++
++    private static void updateConfigVersion() {
++
++    }
 +}
 diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f15cffe87dd294d25b40dae056eb6964c3610d0d
+index 0000000000000000000000000000000000000000..7c20367b93416b5434bdc29556aeafb21ea5b1c3
 --- /dev/null
 +++ b/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,70 @@
 +package fr.euphilia.tenseimc;
 +
 +import org.bukkit.World;
@@ -164,7 +169,7 @@ index 0000000000000000000000000000000000000000..f15cffe87dd294d25b40dae056eb6964
 +    }
 +
 +    public void init() {
-+        TenseiConfig.log(Level.INFO, "-------- World Settings For [ %s ] --------".formatted(worldName));
++        TenseiConfig.log(Level.INFO, "-------- World Settings TenseiMC For [ %s ] --------".formatted(worldName));
 +        TenseiConfig.readConfig(TenseiWorldConfig.class, this);
 +    }
 +
@@ -206,9 +211,12 @@ index 0000000000000000000000000000000000000000..f15cffe87dd294d25b40dae056eb6964
 +        return value.isEmpty() ? fallback : value;
 +    }
 +
++    private void updateConfigVersion() {
++
++    }
 +}
 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
@@ -227,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 {
@@ -247,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 5ff32e5500fecd4c87ef34a2afb2ab11891cb3f3..e54716eb3d916c1db04f76613ac81c5516145d4c 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);
          }
 
@@ -282,7 +290,7 @@ index 5ff32e5500fecd4c87ef34a2afb2ab11891cb3f3..e54716eb3d916c1db04f76613ac81c55
          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 {