Updated Upstream(Folia)

LuminolMC · Aug 9, 2024 · d547f8a · d547f8a
1 parent a22472f
commit d547f8a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build_1.21.yml → .github/workflows/build_1.21.1.yml b/.github/workflows/build_1.21.yml → .github/workflows/build_1.21.1.yml
@@ -2,9 +2,9 @@ name: Luminol CI - dev/1.21
 
 on:
     push:
-      branches: [ "dev/1.21" ]
+      branches: [ "dev/1.21.1" ]
     pull_request:
-      branches: [ "de/1.21" ]
+      branches: [ "de/1.21.1" ]
 
 permissions: write-all
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 group = me.earthme.luminol
-version = 1.21-R0.1-SNAPSHOT
+version = 1.21.1-R0.1-SNAPSHOT
 
-foliaCommit = 2b8c8798972a8393914027c45e544dd997375807
+foliaCommit = e402f963b5c4d42921a67c4e789e1718635c8a83
 
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
 
-mcVersion = 1.21
+mcVersion = 1.21.1
 GroupMCV = 1.21
 preVersion = true
diff --git a/patches/server/0022-Try-optimizing-the-task-dispatching.patch b/patches/server/0022-Try-optimizing-the-task-dispatching.patch
@@ -44,10 +44,10 @@ index ce388e0ef231d7d73f75f5778c58eb40f6402f0f..7f8473a6db78dc652e0ccfdb7cc03812
          private final Long2ReferenceOpenHashMap<ThreadedRegionSection<R, S>> sectionByKey = new Long2ReferenceOpenHashMap<>();
          private final ReferenceOpenHashSet<ThreadedRegionSection<R, S>> deadSections = new ReferenceOpenHashSet<>();
 diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index c43b263e6502ba48a876803385f8d05c5e84ba3e..bfabe758e61e196fd9f4abb3ee793ef3be420c6d 100644
+index a18da3f3f245031f0547efe9b52a1f2a219ef04a..5e390b2b88d3028f2b2eb07432a9b2a1b2851a3e 100644
 --- a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -357,6 +357,47 @@ public final class TickRegionScheduler {
+@@ -354,6 +354,47 @@ public final class TickRegionScheduler {
              return !this.markNotTicking() || this.cancelled.get() ? null : Boolean.valueOf(ret);
          }
 

diff --git a/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
@@ -441,7 +441,7 @@ index c1b0cf6e09914404d1fcf302af03666342e1dc30..dd6c872b8e655119edab5f978067381a
 +    // KioCG end
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index e0359a8857387428d44c19af8dd0e2e743a0b2b5..79f96e698613fdd3bcdbfa3b67870555dc0be46d 100644
+index ea95a382561dcf2bb958a08351d493087a49336a..054587c3a072b0480a3cff0ef9148d708e600baf 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -92,6 +92,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
@@ -452,15 +452,15 @@ index e0359a8857387428d44c19af8dd0e2e743a0b2b5..79f96e698613fdd3bcdbfa3b67870555
 
      public LevelChunk(Level world, ChunkPos pos) {
          this(world, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, (LevelChunkSection[]) null, (LevelChunk.PostLoadProcessor) null, (BlendingData) null);
-@@ -1046,6 +1047,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -1051,6 +1052,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
 
                          gameprofilerfiller.push(this::getType);
                          this.blockEntity.tickTimer.startTiming(); // Spigot
 +                        LevelChunk.this.chunkHot.startTicking(); // KioCG
                          profiler.startTimer(timerId); try { // Folia - profiler
                          BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
 
-@@ -1076,6 +1078,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -1081,6 +1083,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                      } finally {
                          this.blockEntity.tickTimer.stopTiming();
                          // Spigot end

diff --git a/patches/server/0056-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0056-Threaded-region-start-tick-and-finished-tick-event.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Threaded region start tick and finished tick event
 
 
 diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index bfabe758e61e196fd9f4abb3ee793ef3be420c6d..7817fad2c7aa8ae73c0720a749fe45dcfface610 100644
+index 5e390b2b88d3028f2b2eb07432a9b2a1b2851a3e..a69d34806db355c99a9ca438f4b5a3263bf666ac 100644
 --- a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -435,7 +435,7 @@ public final class TickRegionScheduler {
+@@ -432,7 +432,7 @@ public final class TickRegionScheduler {
 
              final long scheduledStart = this.getScheduledStart();
              final long scheduledEnd = scheduledStart + TIME_BETWEEN_TICKS;
@@ -17,7 +17,7 @@ index bfabe758e61e196fd9f4abb3ee793ef3be420c6d..7817fad2c7aa8ae73c0720a749fe45dc
              synchronized (this) {
                  this.currentTickData = new TickTime(
                      lastTickStart, scheduledStart, tickStart, cpuStart,
-@@ -470,6 +470,7 @@ public final class TickRegionScheduler {
+@@ -464,6 +464,7 @@ public final class TickRegionScheduler {
                  );
 
                  this.addTickTime(time);