From 6626c3f12f87f37cb057edf7f8eee405aed74783 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Mon, 29 Apr 2024 21:16:01 -0400
Subject: [PATCH] Update 1.20.6

---
 build.gradle.kts                                  |  1 -
 gradle.properties                                 |  6 +++---
 patches/server/0008-Gale-configuration.patch      | 10 +++++-----
 patches/server/0017-Remove-vanilla-profiler.patch |  4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fd1fa66..1e6185d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import io.papermc.paperweight.util.path
-import org.gradle.configurationcache.extensions.capitalized
 import kotlin.io.path.deleteRecursively
 
 plugins {
diff --git a/gradle.properties b/gradle.properties
index b98bb41..63706a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group=org.galemc.gale
-version=1.20.5-R0.1-SNAPSHOT
+version=1.20.6-R0.1-SNAPSHOT
 
-mcVersion=1.20.5
-paperRef=8f7ac62905dbeeef1ad000a44c7dd035d4e115b0
+mcVersion=1.20.6
+paperRef=812ccb96a480cc6518ba5ddde11e12c22691c061
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0008-Gale-configuration.patch b/patches/server/0008-Gale-configuration.patch
index 334ef83..84b54e3 100644
--- a/patches/server/0008-Gale-configuration.patch
+++ b/patches/server/0008-Gale-configuration.patch
@@ -38,7 +38,7 @@ index 7620c72a4c243cbeea245203ce03a97cbfa7d922..29796a404e210f7864f4b33b3367e025
          JSONObject object = new JSONObject();
          for (String key : config.getKeys(false)) {
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index 4495e1e8930619a0d58745cc55c69a5b574eb698..6684e1932d667f8f29d90eb71e3ac9863832f677 100644
+index 96142deb42700f888ea08689ab62c27ef2b881fd..6f1ce6bfca1ab1cb64c6da381329349b7f1153c1 100644
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
 @@ -7,8 +7,11 @@ import io.papermc.paper.configuration.constraint.Constraint;
@@ -107,10 +107,10 @@ index 4495e1e8930619a0d58745cc55c69a5b574eb698..6684e1932d667f8f29d90eb71e3ac986
 +
  }
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index d99489e0216b24d27a19c92a1ce0c10ae10d071f..652487d60a65141832f3d1c8a45cd98e59402f48 100644
+index 83a726bcf8b7dce73a361b0d79dbd63a0afc7a12..08ca3427acd2b37140a5af28dd61004188999408 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -320,7 +320,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -321,7 +321,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          }
      }
  
@@ -119,7 +119,7 @@ index d99489e0216b24d27a19c92a1ce0c10ae10d071f..652487d60a65141832f3d1c8a45cd98e
          return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess(), level.getGameRules());
      }
  
-@@ -423,17 +423,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -424,17 +424,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
      }
  
@@ -137,7 +137,7 @@ index d99489e0216b24d27a19c92a1ce0c10ae10d071f..652487d60a65141832f3d1c8a45cd98e
      @Deprecated
      public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
          YamlConfiguration config = new YamlConfiguration();
-@@ -456,9 +445,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -457,9 +446,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
      }
  
      // Symlinks are not correctly checked in createDirectories
diff --git a/patches/server/0017-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch
index a1e71a4..15b0c85 100644
--- a/patches/server/0017-Remove-vanilla-profiler.patch
+++ b/patches/server/0017-Remove-vanilla-profiler.patch
@@ -1765,7 +1765,7 @@ index a7930f9875aa4aca997caaead46ecdc21e5e11d7..64ec94ba2b2ce3884f56c95464384fbc
              this.assignProfessionWhenSpawned = false;
          }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index feb470e8036ecfcd838cff05a0dc1d43cc96ae3c..e927f278e0b5545a25cb9a17bcb4b7b3d79fb8f8 100644
+index dc88014c4d9f172cc54e5d77b488128f9ffbc73d..f8c6e2e6ce796196647272bb6e7996f7c7077d4b 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -681,7 +681,6 @@ public class Explosion {
@@ -1776,7 +1776,7 @@ index feb470e8036ecfcd838cff05a0dc1d43cc96ae3c..e927f278e0b5545a25cb9a17bcb4b7b3
              List<Pair<ItemStack, BlockPos>> list = new ArrayList();
  
              Util.shuffle(this.toBlow, this.level.random);
-@@ -757,7 +756,6 @@ public class Explosion {
+@@ -759,7 +758,6 @@ public class Explosion {
                  Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst());
              }