From 893ce2a77ae2c2c31638a4c1e73cde595c4c21ec Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 22 Mar 2023 06:36:59 -0700 Subject: [PATCH] add back pufferfish config relocatable patch --- ...-Make-pufferfish-config-relocatable.patch} | 20 +++++++++---------- ...6-Implement-ram-and-rambar-commands.patch} | 0 ...287-Add-item-packet-serialize-event.patch} | 2 +- ...-123848.patch => 0288-Fix-MC-123848.patch} | 0 ...quid-colors-for-rainglow-fabric-mod.patch} | 0 ...n-to-fix-MC-3304-projectile-looting.patch} | 0 ...Configurable-block-blast-resistance.patch} | 0 ...gurable-block-fall-damage-modifiers.patch} | 0 ...uage-API.patch => 0293-Language-API.patch} | 0 ... 0294-Milk-Keeps-Beneficial-Effects.patch} | 0 ...s-not-looking-up-and-down-when-stra.patch} | 0 ...d-log-suppression-for-LibraryLoader.patch} | 0 ...ransparent-Blocks-In-Enchanting-Box.patch} | 0 ...ow-creeper-to-encircle-target-when-.patch} | 0 ...API.patch => 0299-Fire-Immunity-API.patch} | 0 ...eport-to-spawn-on-nether-ceiling-da.patch} | 0 ...t.patch => 0301-Added-got-ram-event.patch} | 0 ... 0302-Log-skipped-entity-s-position.patch} | 0 ....patch => 0303-End-Crystal-Cramming.patch} | 0 ...eacon-effects-when-covered-by-tinte.patch} | 0 ...ute-clamping-and-armor-limit-config.patch} | 0 ...ig-to-remove-explosion-radius-clamp.patch} | 0 ...ble-sugarcane-cactus-and-netherwart.patch} | 0 ....patch => 0308-Add-PreExplodeEvents.patch} | 0 ...9-Improve-output-of-plugins-command.patch} | 0 25 files changed, 11 insertions(+), 11 deletions(-) rename patches/{removed/server/0284-Make-pufferfish-config-relocatable.patch => server/0285-Make-pufferfish-config-relocatable.patch} (88%) rename patches/server/{0285-Implement-ram-and-rambar-commands.patch => 0286-Implement-ram-and-rambar-commands.patch} (100%) rename patches/server/{0286-Add-item-packet-serialize-event.patch => 0287-Add-item-packet-serialize-event.patch} (97%) rename patches/server/{0287-Fix-MC-123848.patch => 0288-Fix-MC-123848.patch} (100%) rename patches/server/{0288-Implement-squid-colors-for-rainglow-fabric-mod.patch => 0289-Implement-squid-colors-for-rainglow-fabric-mod.patch} (100%) rename patches/server/{0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch => 0290-Add-an-option-to-fix-MC-3304-projectile-looting.patch} (100%) rename patches/server/{0290-Configurable-block-blast-resistance.patch => 0291-Configurable-block-blast-resistance.patch} (100%) rename patches/server/{0291-Configurable-block-fall-damage-modifiers.patch => 0292-Configurable-block-fall-damage-modifiers.patch} (100%) rename patches/server/{0292-Language-API.patch => 0293-Language-API.patch} (100%) rename patches/server/{0293-Milk-Keeps-Beneficial-Effects.patch => 0294-Milk-Keeps-Beneficial-Effects.patch} (100%) rename patches/server/{0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch => 0295-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch} (100%) rename patches/server/{0295-Add-log-suppression-for-LibraryLoader.patch => 0296-Add-log-suppression-for-LibraryLoader.patch} (100%) rename patches/server/{0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch => 0297-Allow-Transparent-Blocks-In-Enchanting-Box.patch} (100%) rename patches/server/{0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch => 0298-Add-option-to-allow-creeper-to-encircle-target-when-.patch} (100%) rename patches/server/{0298-Fire-Immunity-API.patch => 0299-Fire-Immunity-API.patch} (100%) rename patches/server/{0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch => 0300-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch} (100%) rename patches/server/{0300-Added-got-ram-event.patch => 0301-Added-got-ram-event.patch} (100%) rename patches/server/{0301-Log-skipped-entity-s-position.patch => 0302-Log-skipped-entity-s-position.patch} (100%) rename patches/server/{0302-End-Crystal-Cramming.patch => 0303-End-Crystal-Cramming.patch} (100%) rename patches/server/{0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch => 0304-Option-to-allow-beacon-effects-when-covered-by-tinte.patch} (100%) rename patches/server/{0304-Add-attribute-clamping-and-armor-limit-config.patch => 0305-Add-attribute-clamping-and-armor-limit-config.patch} (100%) rename patches/server/{0305-Config-to-remove-explosion-radius-clamp.patch => 0306-Config-to-remove-explosion-radius-clamp.patch} (100%) rename patches/server/{0306-bonemealable-sugarcane-cactus-and-netherwart.patch => 0307-bonemealable-sugarcane-cactus-and-netherwart.patch} (100%) rename patches/server/{0307-Add-PreExplodeEvents.patch => 0308-Add-PreExplodeEvents.patch} (100%) rename patches/server/{0308-Improve-output-of-plugins-command.patch => 0309-Improve-output-of-plugins-command.patch} (100%) diff --git a/patches/removed/server/0284-Make-pufferfish-config-relocatable.patch b/patches/server/0285-Make-pufferfish-config-relocatable.patch similarity index 88% rename from patches/removed/server/0284-Make-pufferfish-config-relocatable.patch rename to patches/server/0285-Make-pufferfish-config-relocatable.patch index 25055e859..a5afa768d 100644 --- a/patches/removed/server/0284-Make-pufferfish-config-relocatable.patch +++ b/patches/server/0285-Make-pufferfish-config-relocatable.patch @@ -5,28 +5,28 @@ Subject: [PATCH] Make pufferfish config relocatable diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index 5f3be4356a6d65ea2a7e4d013abd4501cedd7428..f3593297929842b52e4467ed4386ab12586b1b70 100644 +index 866498779e824b971479e92b736b97aa05ce48a3..62b2a3a44929b80b813bc24a33cd1f5049fecbb2 100644 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java @@ -28,6 +28,7 @@ public class PufferfishConfig { - + private static final YamlFile config = new YamlFile(); private static int updates = 0; + public static File pufferfishFile; // Purpur - + private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) { ConfigurationSection newSection = new MemoryConfiguration(); @@ -50,7 +51,7 @@ public class PufferfishConfig { } - + public static void load() throws IOException { - File configFile = new File("pufferfish.yml"); + File configFile = pufferfishFile; // Purpur - + if (configFile.exists()) { try { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 14c31ac94202e5266610869d3dd93b871cfb4557..46858fb57f122033a68aeb4ad3943132a677fb46 100644 +index bed0267d42a8dbbd2996bd19c65d09a5ab27b5d2..582467e3419c23446b20d3076fbfce22115250a8 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -230,6 +230,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -36,12 +36,12 @@ index 14c31ac94202e5266610869d3dd93b871cfb4557..46858fb57f122033a68aeb4ad3943132 + gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish - + diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 8e706d752b6bbda353d85ce10cdb83a68a4f71d8..576cd8e20982bb20d10213b6c7a229428eec1c2f 100644 +index ad4bc3f46bb6f02284ecf62e2701bb627e096b15..ab05f4151e6ec7404a85ddb3a141ed39d9ed86d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -172,6 +172,12 @@ public class Main { +@@ -179,6 +179,12 @@ public class Main { .ofType(File.class) .defaultsTo(new File("purpur.yml")) .describedAs("Yml file"); @@ -52,5 +52,5 @@ index 8e706d752b6bbda353d85ce10cdb83a68a4f71d8..576cd8e20982bb20d10213b6c7a22942 + .defaultsTo(new File("pufferfish.yml")) + .describedAs("Yml file"); // Purpur end - + // Paper start diff --git a/patches/server/0285-Implement-ram-and-rambar-commands.patch b/patches/server/0286-Implement-ram-and-rambar-commands.patch similarity index 100% rename from patches/server/0285-Implement-ram-and-rambar-commands.patch rename to patches/server/0286-Implement-ram-and-rambar-commands.patch diff --git a/patches/server/0286-Add-item-packet-serialize-event.patch b/patches/server/0287-Add-item-packet-serialize-event.patch similarity index 97% rename from patches/server/0286-Add-item-packet-serialize-event.patch rename to patches/server/0287-Add-item-packet-serialize-event.patch index f530a1bd6..bf867c45f 100644 --- a/patches/server/0286-Add-item-packet-serialize-event.patch +++ b/patches/server/0287-Add-item-packet-serialize-event.patch @@ -36,7 +36,7 @@ index 9938bb90bef84cf784f9a1ceb02a1a45aa8b48a1..1f4b64a5f812376c499c98cb4be62469 this.writeId(BuiltInRegistries.ITEM, item); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ece713391f4ab35a61b733ef00bf156b5b814c21..17a623c3fa095ab530b9d311874c92c3d5b583c1 100644 +index fc6ce3c622a7e7b6f061284d57af44f4a0dfa0d4..2cc20cc768bbbd386972c426d3a131af33612294 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1547,6 +1547,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop