Revert "[CI-Skip] Updated Dependencies (Paperweight)"

This reverts commit 017f695244.
Fix Incompat (Bump-Dependencies)
2023-09-22 17:45:44 +09:00 · 2023-09-19 09:27:56 +09:00 · 2023-09-15 17:13:59 +00:00 · 2023-09-15 16:41:56 +00:00 · 2023-09-14 21:34:34 +00:00 · 2023-09-14 11:21:18 +00:00
9 changed files with 18 additions and 18 deletions
--- a/.upstream-data
+++ b/.upstream-data
@@ -1,2 +1,2 @@
-purpurCommit = 7927f53553abfa8c4d4bc4d5eb29dda44144f3dc
-pufferfishCommit = e32a780bcab6821e3804846a63a9153fdeee44f4
+purpurCommit = 07b13f287c8c63e5b2f23c32c52e5d8012ff2eb7
+pufferfishCommit = 0020a8bd30741675ac348af30cc50d19d3566cff
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.plazmamc.plazma
 version = 1.20.1-R0.1-SNAPSHOT

-paperCommit = eea0c649ca7c212cd274e7d34bb440cfb5c47fb5
+paperCommit = 29d1c7b60244bb002d29a5dcfc9c995019f550ab

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:16:16 +0000
+Date: Fri, 15 Sep 2023 16:37:43 +0000
 Subject: [PATCH] Pufferfish API Changes

 Original: Kevin Raneri <kevin.raneri@gmail.com>
--- a/patches/api/0002-Purpur-API-Changes.patch
+++ b/patches/api/0002-Purpur-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:17:56 +0000
+Date: Fri, 15 Sep 2023 16:39:50 +0000
 Subject: [PATCH] Purpur API Changes

 Original: PurpurMC
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:16:16 +0000
+Date: Fri, 15 Sep 2023 16:37:43 +0000
 Subject: [PATCH] Pufferfish Server Changes

 Original: Kevin Raneri <kevin.raneri@gmail.com>
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 13 Sep 2023 23:17:56 +0000
+Date: Fri, 15 Sep 2023 16:39:49 +0000
 Subject: [PATCH] Purpur Server Changes

 Original: PurpurMC
@@ -955,7 +955,7 @@ index 9b0049dfeaec9b688bf276f2ac2b18943b5696b2..d7563904232353cbf3b9255cedfb7592
                     return true;
                 }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..89c1b69ddeb420c2fbda5f588e7c9a467a76089d 100644
+index 52cb6476604c98465f81ff9e8d8344d7536a8868..13144ea01bc27db95a13b267d39529b012a4c9c4 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -579,11 +579,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
--- a/patches/server/0006-Bump-Dependencies.patch
+++ b/patches/server/0006-Bump-Dependencies.patch
@@ -66,7 +66,7 @@ index d8b27e3f2fa1ede41125ec27e129b1e1ad42caa7..2c59ed16ea909b6535df3d1d40d83b06
 
     // Pufferfish start
 -    implementation("org.yaml:snakeyaml:1.32")
-+    implementation("org.yaml:snakeyaml:2.2")
+    implementation("org.yaml:snakeyaml:1.33")
     implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
         exclude(group="org.yaml", module="snakeyaml")
     }
--- a/patches/server/0007-Plazma-Configurations.patch
+++ b/patches/server/0007-Plazma-Configurations.patch
@@ -104,7 +104,7 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..28a1d21900dbff4b9d1887b9aa4e68f4
 +    // Plazma end
 }
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index e471960e0443392f6f54732b052a4debf2a8fd97..928cb4827768667a975036da73b25abdd74a489f 100644
+index 2d3068b7748032342edd81e6ea4a7c08988fb28d..300b76731e1226b670cc51dfacf8e1cce4f04f7c 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
@@ -135,7 +135,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -116,7 +116,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..928cb4827768667a975036da73b25abd
 
 
     public PaperConfigurations(final Path globalFolder) {
-@@ -300,7 +300,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -303,7 +303,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
         }
     }
 
@@ -125,7 +125,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..928cb4827768667a975036da73b25abd
         return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig);
     }
 
-@@ -399,18 +399,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -402,18 +402,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
 
     private static boolean needsConverting(final Path legacyConfig) {
         return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
@@ -145,7 +145,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..928cb4827768667a975036da73b25abd
 
     @Deprecated
     public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
-@@ -434,9 +423,15 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -437,9 +426,15 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
     }
 
     // Symlinks are not correctly checked in createDirectories
@@ -263,7 +263,7 @@ index 221d1d0e1b4b46de6ebca5faac09bbda875fae17..e009dba395779e2c89a36fe4524e5d40
         this.convertable = convertable_conversionsession;
         this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9fb140b3b6a0c621466b85a6ec7df765a4e823b0..08f9af1d7aebba943096b59b6452818a1aafc94c 100644
+index 32bd43692b701b49776c10d9c4332bb41322b9fa..a6e7d98d1f4848b11a3776d8e7a42a56a1543865 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -174,7 +174,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
--- a/patches/server/0009-Optimize-Default-Configurations.patch
+++ b/patches/server/0009-Optimize-Default-Configurations.patch
@@ -7,7 +7,7 @@ Original: YouHaveTrouble/minecraft-optimization, AkiraDevelopment/SimplyMC
 Copyright (C) 2023 YouHaveTrouble, AkiraDevelopment

 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index bff1b41501c040487583a5a279fc7800fc6aedca..2d7e1ffa117fa2581ab2a42cd04d062f25559b11 100644
+index 3e36958365bc136516bafbaad0c168f7956406f1..b5eca4a809d5e7c77de9737941f3f6c35e4fc796 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -211,8 +211,8 @@ public class PufferfishConfig {
@@ -43,10 +43,10 @@ index bff1b41501c040487583a5a279fc7800fc6aedca..2d7e1ffa117fa2581ab2a42cd04d062f
                 "If you want further away entities to tick less often, use 7.",
                 "If you want further away entities to tick more often, try 9.");
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 019d3bbd78fb0b06861979d223915fedb6c99442..553127c9a38612005530cffdb25544585e6c8234 100644
+index 3bc7230ca62ebe3426da293e436a962bb0134f85..1a4b5dc4c5340de66553936bbbc074d1654a3ef8 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -142,7 +142,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -143,7 +143,7 @@ public class GlobalConfiguration extends ConfigurationPart {
 
     public class Watchdog extends ConfigurationPart {
         public int earlyWarningEvery = 5000;
@@ -197,7 +197,7 @@ index 24763d3d270c29c95e0b3e85111145234f660a62..18bc271a34ffba8c83743fef7eaf4a2c
     }
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 903da36aeec8e8c7d1f3101d1e93f87412a7eed5..79593800173ad2b837b081e6091e98adfa41fb99 100644
+index a8bf67cf0c579c407befe17d735440f1128d98c4..62a886dd6c9b3d22eb9d96b275a2f4e133f6d306 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
@@ -155,7 +155,7 @@ public class Main {
Author	SHA1	Message	Date
AlphaKR93	74c593fa04	Revert "[CI-Skip] Updated Dependencies (Paperweight)" This reverts commit `017f695244`.	2023-09-22 17:45:44 +09:00
IPECTER 이팩터	c6c048c34f	Fix Incompat (Bump-Dependencies) Signed-off-by: IPECTER 이팩터 <80433772+IPECTER@users.noreply.github.com>	2023-09-19 09:27:56 +09:00
github-actions[bot]	017f695244	[CI-Skip] Updated Dependencies (Paperweight) Dependency has released updates that appear to apply and compile correctly Paperweight Changes: PaperMC/Paperweight@d3d7eec chore: Bump ASM & lorenz-tiny PaperMC/Paperweight@972de2e Add task to scan generated code to make sure versions match PaperMC/Paperweight@9f602b8 Fix license formats PaperMC/Paperweight@92f922f support importing files from data/minecraft/ into the resources folder PaperMC/Paperweight@33b8a1b add task to filter project dir PaperMC/Paperweight@329b566 fix a couple issues after rebasing on main PaperMC/Paperweight@a3033c6 fix license and style violations PaperMC/Paperweight@ce9df1c account for inner classes PaperMC/Paperweight@57566dd Remove commented code PaperMC/Paperweight@3f6c7a5 Fix Gradle deprecation issue, buildSrc missing name PaperMC/Paperweight@c2d4fcb fix FilterProjectDir vanillaJar input PaperMC/Paperweight@de15167 Merge pull request #198 from Machine-Maker/fix/FilterProjectDir PaperMC/Paperweight@28786b0 use ceilingEntry instead of higherEntry for line mappings PaperMC/Paperweight@d23909c adjust ScanJar loggers PaperMC/Paperweight@8faebd1 release: Version 1.5.6	2023-09-15 17:13:59 +00:00
github-actions[bot]	ecbebeb403	Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@07b13f2 Updated Upstream (Paper)	2023-09-15 16:41:56 +00:00
github-actions[bot]	5bf8a8124e	Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@29d1c7b Call BlockRedstoneEvents for lecterns (#9721)	2023-09-14 21:34:34 +00:00
github-actions[bot]	3e35bff9a0	Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e68fd71 Add missing Piglin Dancing API (#8894) PaperMC/Paper@6378792 Add Barrel to LootableBlockInventory (#9687) PaperMC/Paper@7145f41 compression level change with config option (#9711)	2023-09-14 11:21:18 +00:00