Purpur config files

Euphillya · Nov 2, 2023 · aff1740 · aff1740
1 parent 32b135c
commit aff1740
Show file tree

Hide file tree

Showing 41 changed files with 494 additions and 10 deletions.
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 41bf1e46762db4a56bf04f6a62a909c0c04b4c43..73f79b1d5413c4ed82f68bf0d48f84c27ec8e52e 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
+         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
@@ -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 73f79b1d5413c4ed82f68bf0d48f84c27ec8e52e..614f97f8471e66f582f839d5a26a0ad8eb24199a 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
+@@ -2427,4 +2427,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
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
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
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/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
diff --git a/.../0004-Purpur-EnderChest-1-to-6-Rows.patch → .../0005-Purpur-EnderChest-1-to-6-Rows.patch b/.../0004-Purpur-EnderChest-1-to-6-Rows.patch → .../0005-Purpur-EnderChest-1-to-6-Rows.patch
@@ -125,7 +125,7 @@ index 4703f23316f82a1a942907b46d2d6dcb7d70ec37..bd52a4514ef9eac36c89e7db734a74b2
          this.activeChest = blockEntity;
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-index 7385e91f32f070e86a4e0fd3d214f55d832c7979..95bf667c2e3cf60e06bf8bd34f77b61522223081 100644
+index 7385e91f32f070e86a4e0fd3d214f55d832c7979..ed7fd0a04c941698840b12e1e0e35a0274f41007 100644
 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
 @@ -85,6 +85,32 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i

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
@@ -49,7 +49,7 @@ index a18aadbf7ae83713e1f2b21553185d8000bc7699..aac9515a73e2e9d449ca4e2c99874963
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e54716eb3d916c1db04f76613ac81c5516145d4c..1a7f17e7d85dd42c7331d79712e698c956e20f49 100644
+index 99e0c374d3495121a08993d2581a2e33b9f98848..164eb1601b84461fd94f5293dd42244fd8d38d69 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -265,6 +265,7 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot

diff --git a/...-Option-for-disable-observer-clocks.patch → ...-Option-for-disable-observer-clocks.patch b/...-Option-for-disable-observer-clocks.patch → ...-Option-for-disable-observer-clocks.patch
diff --git a/...0007-Configurable-piston-push-limit.patch → ...0008-Configurable-piston-push-limit.patch b/...0007-Configurable-piston-push-limit.patch → ...0008-Configurable-piston-push-limit.patch
diff --git a/...s/server/0008-Purpur-Barrels-6-rows.patch → ...s/server/0009-Purpur-Barrels-6-rows.patch b/...s/server/0008-Purpur-Barrels-6-rows.patch → ...s/server/0009-Purpur-Barrels-6-rows.patch
diff --git a/...r/0009-Disable-outdated-build-check.patch → ...r/0010-Disable-outdated-build-check.patch b/...r/0009-Disable-outdated-build-check.patch → ...r/0010-Disable-outdated-build-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 266122ad86855de1b9e7c50b528637831376ac7e..3ffc77446cea2c8c295ddcf11e2dfe4b9a0aeda9 100644
+index b3e9f339249d0a0af9e5e162b8b4d834a456a43f..37ee437c8ad47820dc978e1a7dd17ef75bdda70b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -300,7 +300,7 @@ public class Main {
+@@ -306,7 +306,7 @@ public class Main {
                      System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
 

diff --git a/...es/server/0010-More-API-Enchantment.patch → ...es/server/0011-More-API-Enchantment.patch b/...es/server/0010-More-API-Enchantment.patch → ...es/server/0011-More-API-Enchantment.patch
diff --git a/...eacon-Activation-Range-Configurable.patch → ...eacon-Activation-Range-Configurable.patch b/...eacon-Activation-Range-Configurable.patch → ...eacon-Activation-Range-Configurable.patch
diff --git a/...012-Compostable-items-configuration.patch → ...013-Compostable-items-configuration.patch b/...012-Compostable-items-configuration.patch → ...013-Compostable-items-configuration.patch
diff --git a/...13-Method-Custom-WorldBorder-Player.patch → ...14-Method-Custom-WorldBorder-Player.patch b/...13-Method-Custom-WorldBorder-Player.patch → ...14-Method-Custom-WorldBorder-Player.patch
diff --git a/...ver/0014-Method-Update-Chunk-Client.patch → ...ver/0015-Method-Update-Chunk-Client.patch b/...ver/0014-Method-Update-Chunk-Client.patch → ...ver/0015-Method-Update-Chunk-Client.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/...ge-multiplier-critical-damage-value.patch → ...ge-multiplier-critical-damage-value.patch b/...ge-multiplier-critical-damage-value.patch → ...ge-multiplier-critical-damage-value.patch
diff --git a/...Amethyst-recoverable-with-SilkTouch.patch → ...Amethyst-recoverable-with-SilkTouch.patch b/...Amethyst-recoverable-with-SilkTouch.patch → ...Amethyst-recoverable-with-SilkTouch.patch
diff --git a/...-chests-to-open-even-with-a-solid-b.patch → ...-chests-to-open-even-with-a-solid-b.patch b/...-chests-to-open-even-with-a-solid-b.patch → ...-chests-to-open-even-with-a-solid-b.patch
diff --git a/...e-can-work-when-raining-or-at-night.patch → ...e-can-work-when-raining-or-at-night.patch b/...e-can-work-when-raining-or-at-night.patch → ...e-can-work-when-raining-or-at-night.patch
diff --git a/...Config-to-change-max-number-of-bees.patch → ...Config-to-change-max-number-of-bees.patch b/...Config-to-change-max-number-of-bees.patch → ...Config-to-change-max-number-of-bees.patch
diff --git a/...Halloween-options-and-optimizations.patch → ...Halloween-options-and-optimizations.patch b/...Halloween-options-and-optimizations.patch → ...Halloween-options-and-optimizations.patch
diff --git a/...ur-PlayerSetSpawnerTypeWithEggEvent.patch → ...ur-PlayerSetSpawnerTypeWithEggEvent.patch b/...ur-PlayerSetSpawnerTypeWithEggEvent.patch → ...ur-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/...023-Configurable-broadcast-settings.patch → ...024-Configurable-broadcast-settings.patch b/...023-Configurable-broadcast-settings.patch → ...024-Configurable-broadcast-settings.patch
diff --git a/patches/server/0024-Purpur-Anvil-API.patch → patches/server/0025-Purpur-Anvil-API.patch b/patches/server/0024-Purpur-Anvil-API.patch → patches/server/0025-Purpur-Anvil-API.patch
diff --git a/...rver/0025-Config-MobEffect-by-world.patch → ...rver/0026-Config-MobEffect-by-world.patch b/...rver/0025-Config-MobEffect-by-world.patch → ...rver/0026-Config-MobEffect-by-world.patch
diff --git a/...6-Purpur-Implement-infinite-liquids.patch → ...7-Purpur-Implement-infinite-liquids.patch b/...6-Purpur-Implement-infinite-liquids.patch → ...7-Purpur-Implement-infinite-liquids.patch
diff --git a/...r-Make-lava-flow-speed-configurable.patch → ...r-Make-lava-flow-speed-configurable.patch b/...r-Make-lava-flow-speed-configurable.patch → ...r-Make-lava-flow-speed-configurable.patch
diff --git a/...-Make-water-flow-speed-configurable.patch → ...-Make-water-flow-speed-configurable.patch b/...-Make-water-flow-speed-configurable.patch → ...-Make-water-flow-speed-configurable.patch
diff --git a/...ngs-PR-Vanilla-End-Teleportation-So.patch → ...ngs-PR-Vanilla-End-Teleportation-So.patch b/...ngs-PR-Vanilla-End-Teleportation-So.patch → ...ngs-PR-Vanilla-End-Teleportation-So.patch
diff --git a/...Unsupported-Settings-World-Load-API.patch → ...Unsupported-Settings-World-Load-API.patch b/...Unsupported-Settings-World-Load-API.patch → ...Unsupported-Settings-World-Load-API.patch
@@ -42,10 +42,10 @@ index b62137def6ac3826eb5d9e367d97579b32fe01d2..93398f0e887c4c177ce6a4c0dd6b2148
                  world.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> {
                      return iregistry.getHolder(MiscOverworldFeatures.BONUS_CHEST);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1a7f17e7d85dd42c7331d79712e698c956e20f49..73c015acc0c1801316192f1186375b9f90a506c8 100644
+index 164eb1601b84461fd94f5293dd42244fd8d38d69..c2215c237e20459524520cd2933f9a5f8288dc6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1293,7 +1293,7 @@ public final class CraftServer implements Server {
+@@ -1296,7 +1296,7 @@ public final class CraftServer implements Server {
 
      @Override
      public World createWorld(WorldCreator creator) {
@@ -54,7 +54,7 @@ index 1a7f17e7d85dd42c7331d79712e698c956e20f49..73c015acc0c1801316192f1186375b9f
          Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
          //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
          Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
-@@ -1413,6 +1413,11 @@ public final class CraftServer implements Server {
+@@ -1416,6 +1416,11 @@ public final class CraftServer implements Server {
          if (!(this.worlds.containsKey(name.toLowerCase(java.util.Locale.ENGLISH)))) {
              return null;
          }
@@ -66,7 +66,7 @@ index 1a7f17e7d85dd42c7331d79712e698c956e20f49..73c015acc0c1801316192f1186375b9f
 
          this.console.addLevel(internal); // Paper - move up
          this.console.initWorld(internal, worlddata, worlddata, worlddata.worldGenOptions());
-@@ -1422,6 +1427,7 @@ public final class CraftServer implements Server {
+@@ -1425,6 +1430,7 @@ public final class CraftServer implements Server {
 
          internal.keepSpawnInMemory = creator.keepSpawnLoaded().toBooleanOrElse(internal.getWorld().getKeepSpawnInMemory()); // Paper
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);

diff --git a/...d-worldborder-I-haven-t-found-any-b.patch → ...d-worldborder-I-haven-t-found-any-b.patch b/...d-worldborder-I-haven-t-found-any-b.patch → ...d-worldborder-I-haven-t-found-any-b.patch