update folia

Edenor-Minecraft · Apr 15, 2024 · 648de5f · 648de5f
1 parent 5f41b44
commit 648de5f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 30 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/patches/server/0005-Add-config.patch b/patches/server/0005-Add-config.patch
@@ -4,22 +4,6 @@ Date: Sat, 16 Sep 2023 21:20:41 +0400
 Subject: [PATCH] Add-config
 
 
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b66ac537a56f907022f615c47ea970c7b26bbf3..f2c473a22cf33a1783f7daec578da5b08caf4878 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -213,9 +213,9 @@ val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
-         elements.filterNot { file -> file.asFile.endsWith("minecraft.jar") }
-     }
- }
--tasks.registerRunTask("runDev") {
-+/*tasks.registerRunTask("runDev") {
-     description = "Spin up a non-relocated Mojang-mapped test server"
-     classpath(tasks.filterProjectDir.flatMap { it.outputJar })
-     classpath(runtimeClasspathForRunDev)
-     jvmArgs("-DPaper.isRunDev=true")
--}
-+}*/
 diff --git a/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java b/src/main/java/net/edenor/foldenor/config/FoldenorConfig.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..748a78a092067ccb2c9ebb650860765180703b8f

diff --git a/patches/server/0014-Linear-Region-Format.patch b/patches/server/0014-Linear-Region-Format.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Linear-Region-Format
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f2c473a22cf33a1783f7daec578da5b08caf4878..d64d011fa8d2dcd566fc173493d6be947115bb24 100644
+index 4c01b60d00f5809dc36c0a6500b2abe3fa58fefd..19a70552d738cad8750547c10be550e223a9a9e1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -19,6 +19,8 @@ dependencies {
@@ -645,7 +645,7 @@ index 0000000000000000000000000000000000000000..7492271e263bba9d302ef1d074e983c9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8cc74922fb00a1975dfb9bd2af8972c7afcfdb14..95d3ae694ad6f50d91a00b99f7b3e44fa1f2f1e6 100644
+index 34c145e343faff682c2a2d37c784fa8ba800b198..3bec684803e2d64457891ed4b987f04ad5a6c7cb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -923,7 +923,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -723,7 +723,7 @@ index 6ab9f83786dcfbd3156d2f2bd6da57baed1399f4..6f83bb505da565a0e54054d11fcb7251
          regionFile.setStatus(chunkPos.x, chunkPos.z, ChunkSerializer.getStatus(compound));
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8f8f6d068058b15e7854b9f91ba2ce9a48f2c7a5..3f1faacab09a6be31e405505169fd3d4bd51eff9 100644
+index 62880be566774cd0da0630662579bc7ee6be4b7e..c0d1e2f0146f75aa264263a445013900564b497f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -38,6 +38,8 @@ import java.util.stream.Collectors;
@@ -1162,10 +1162,10 @@ index 4aac1979cf57300825a999c876fcf24d3170e68e..e1436f956f74b93d0a7bf96388f8af5b
          this.factory = factory;
          this.fixerUpper = dataFixer;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 379c10e791a961d25d7de571f81ace1ac7d84381..c8ec34097502dddb7565ad019b181ae06412d12a 100644
+index becb3b07876715d7c39ba4e7289cc5ac85f84412..0715f4502ed7e0c1bfe8515f710d9c4bc6b037f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -575,7 +575,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -576,7 +576,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                  world.getChunk(x, z); // make sure we're at ticket level 32 or lower
                  return true;
              }

diff --git a/patches/server/0023-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0023-Pufferfish-Cache-climbing-check-for-activation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish-Cache-climbing-check-for-activation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fdb5ef574c14fafa1af50f4f656763119695f00e..02bdcff43918be037255d6050497d01c1e7d697a 100644
+index b9f6e599afd4bdfb97e7f1b1881730cbed781bba..9ae7519f2a0e97ed83776a788ae26a18509ce2da 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2043,6 +2043,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -27,10 +27,10 @@ index fdb5ef574c14fafa1af50f4f656763119695f00e..02bdcff43918be037255d6050497d01c
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f8718d91f4c15c74d6e6dd5f60f7f05f45f63655..877e6286fd4860e4270fee3ddb79a5f4041343b7 100644
+index 4fc4690d03fd5f39e019f16845954052210c7361..da3b09b92c804ee4b98421dbac4165c0b8fdf529 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -305,7 +305,7 @@ public class ActivationRange
+@@ -307,7 +307,7 @@ public class ActivationRange
          if ( entity instanceof LivingEntity )
          {
              LivingEntity living = (LivingEntity) entity;

diff --git a/patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch
@@ -133,7 +133,7 @@ index 085495a2d82f2a514a01602c8aece5ace57eb240..5067fabb3a565d424248ce73212d9542
          config.addDefault(path, val);
          config.set(path, val);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3f1faacab09a6be31e405505169fd3d4bd51eff9..53c74c966a77d6acc60b2951f0416637f4bd8df6 100644
+index c0d1e2f0146f75aa264263a445013900564b497f..bf3332b3156ccbfddb161ad887eab5584f8693bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -992,6 +992,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -145,7 +145,7 @@ index 3f1faacab09a6be31e405505169fd3d4bd51eff9..53c74c966a77d6acc60b2951f0416637
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34a0e80dc00e568af341af78930075bd7983286b..fd02a74b33fbb71ac3ef019065d42d5300d3dfd2 100644
+index 5333ba63c9f79e16667e4c7056b53566d5771d5f..be9e19e5ab4e184f66ea46049067a141b9e4344b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -450,7 +450,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -411,7 +411,7 @@ index 3eeff0cd8563939c656b5ded8470cab016903f25..1d33146c4a8d3c2c0df5ef04f3733961
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index cd46b1131a33fd84b44909a3f50aa95026418bef..fa966b21dddbfe1131043f7a725b864953946216 100644
+index a27e400c5db9dddcaa307758ea7100893dd3819d..e3b3860df83ba5fca232c3b1f217f41c00ca073e 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -39,6 +39,7 @@ import co.aikar.timings.MinecraftTimings;
@@ -422,7 +422,7 @@ index cd46b1131a33fd84b44909a3f50aa95026418bef..fa966b21dddbfe1131043f7a725b8649
 
  public class ActivationRange
  {
-@@ -243,6 +244,22 @@ public class ActivationRange
+@@ -245,6 +246,22 @@ public class ActivationRange
                  }
                  // Paper end - Configurable marker ticking
                  ActivationRange.activateEntity(entity, bbByType); // Folia - threaded regions

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 if (!file(".git").exists()) {