Update Upstream (Folia)

Upstream has released updates that appear to apply and compile correctly Folia Changes : PaperMC/Folia@e876103 Region profiler
Euphillya · Oct 4, 2023 · f861ff8 · f861ff8
1 parent 63c937a
commit f861ff8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group = fr.euphilia.tenseimc
 version = 1.20.2-R0.1-SNAPSHOT
 mcVersion = 1.20.2
 
-foliaRef = cdf356915b9051a6a895e53f663f24afb05c04a2
+foliaRef = e876103942278b4a392634a2e9b204e02d2993a3
 
 org.gradle.caching=true
 org.gradle.parallel=false

diff --git a/patches/server/0001-Rebranding.patch b/patches/server/0001-Rebranding.patch
@@ -121,10 +121,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e720d7f098a619a65b18f55a785ffbe4
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f9cf331202d0768a054e575c8909369920b3d59f..758bcbf493bf7e3b65086f8b38750f28c83dadcb 100644
+index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..b62137def6ac3826eb5d9e367d97579b32fe01d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1816,7 +1816,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1833,7 +1833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {

diff --git a/patches/server/0002-TenseiMC-Config-Files.patch b/patches/server/0002-TenseiMC-Config-Files.patch
@@ -227,7 +227,7 @@ index a9fe3d1c0fc217bd32e884c9e75c906d8b4bf967..e0caf166ee7888e9a9358fb01736b0eb
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f9641a54b2d1f2eed2a48323cfa6cdd67dafdf00..5765c55614a733ef51a16c181203447073a1e0a0 100644
+index 0ff6764c747ee6258ab9d722b48c24f0ddb2afdf..676293d6977d2403df70a4d26a1a34bbf7c2470a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -166,6 +166,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -238,7 +238,7 @@ index f9641a54b2d1f2eed2a48323cfa6cdd67dafdf00..5765c55614a733ef51a16c1812034470
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -230,6 +231,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -233,6 +234,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper

diff --git a/patches/server/0021-Purpur-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0021-Purpur-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur - PlayerSetSpawnerTypeWithEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 73871f456a85bda1e51f54986d0e61fb629822e8..692ad02cb8ff44d9d889e4383afc7b6d36bbf5d2 100644
+index 3f3494c20cd15a721090f1b36293562a6b834b14..ce7178000f78a9bd1b94779e5b10dc8b861564c6 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -314,6 +314,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -25,7 +25,7 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..692ad02cb8ff44d9d889e4383afc7b6d
      public static ResourceLocation getKey(EntityType<?> type) {
          return BuiltInRegistries.ENTITY_TYPE.getKey(type);
      }
-@@ -529,6 +539,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -542,6 +552,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return this.category;
      }