Update upstream (last 1.20.1)

pufferfish-gg · Sep 28, 2023 · 979d3a2 · 979d3a2
1 parent 0020a8b
commit 979d3a2
Show file tree

Hide file tree

Showing 39 changed files with 40 additions and 278 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
 group=gg.pufferfish.pufferfish
 version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
-paperRef=b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b
+paperRef=773dd724469bae89d0c2075edc3d1ddc8d5b0b18
diff --git a/patches/server/0001-Pufferfish-branding.patch b/patches/server/0001-Pufferfish-branding.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Pufferfish branding
 Update branding
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fb98936bb8a5488db75d676c5bcb4060597fbbf8..c6254bc5b9e2b65cd0f9f5ffa2d0b0787649c885 100644
+index 7e0580bbd0a557c7bb269507a99d25db07bf31f1..9af0eb5b7cef9237c03dc6aefaa02923c25bab8c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -33,6 +33,15 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..c6254bc5b9e2b65cd0f9f5ffa2d0b078
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
+@@ -205,7 +209,5 @@ val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
+ }
+ 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")
++    classpath(sourceSets.main.map { it.runtimeClasspath })
+ }
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
 index 4b002e8b75d117b726b0de274a76d3596fce015b..692c962193cf9fcc6801fc93f3220bdc673d527b 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -217,7 +226,7 @@ index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..0b9dd63d9d8a37223d78dc56b0b482a0
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec4b73321205b472f19fa5bd4ad95893020d1340..2d50470761282edfe441021bbb152f9aa1fb2f77 100644
+index 74d06790de674cbd230a0b14ac9a6b614c9f84ef..81ac4dbcf205bbd023d3ea8d0cccc5b6de04bc48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper

diff --git a/patches/server/0010-Disable-Paper-timings-by-default.patch b/patches/server/0010-Disable-Paper-timings-by-default.patch
@@ -5,34 +5,34 @@ Subject: [PATCH] Disable Paper timings by default
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 019d3bbd78fb0b06861979d223915fedb6c99442..2ba11c304ecea73ad3289b471ff304319a837d45 100644
+index 3bc7230ca62ebe3426da293e436a962bb0134f85..61f31094ae81fb11a2d5b866ae45637614661e6c 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -7,6 +7,7 @@ import net.kyori.adventure.text.Component;
+@@ -8,6 +8,7 @@ import net.kyori.adventure.text.Component;
  import net.kyori.adventure.text.format.NamedTextColor;
  import net.minecraft.network.protocol.Packet;
  import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
 +import org.bukkit.Bukkit; // Pufferfish
  import org.checkerframework.checker.nullness.qual.Nullable;
  import org.spongepowered.configurate.objectmapping.ConfigSerializable;
  import org.spongepowered.configurate.objectmapping.meta.Comment;
-@@ -16,6 +17,7 @@ import org.spongepowered.configurate.objectmapping.meta.Setting;
+@@ -17,6 +18,7 @@ import org.spongepowered.configurate.objectmapping.meta.Setting;
  import java.util.List;
  import java.util.Map;
  import java.util.Objects;
 +import java.util.logging.Level; // Pufferfish
 
  @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
  public class GlobalConfiguration extends ConfigurationPart {
-@@ -90,6 +92,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -91,6 +93,7 @@ public class GlobalConfiguration extends ConfigurationPart {
 
      public class Timings extends ConfigurationPart.Post {
          public boolean enabled = true;
 +        public boolean reallyEnabled = false;
          public boolean verbose = true;
          public String url = "https://timings.aikar.co/";
          public boolean serverNamePrivacy = false;
-@@ -103,6 +106,14 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -104,6 +107,14 @@ public class GlobalConfiguration extends ConfigurationPart {
 
          @Override
          public void postProcess() {

diff --git a/...elessRecipes-comparison-for-Vanilla.patch → ...elessRecipes-comparison-for-Vanilla.patch b/...elessRecipes-comparison-for-Vanilla.patch → ...elessRecipes-comparison-for-Vanilla.patch
diff --git a/patches/server/0011-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0011-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/...013-Reduce-projectile-chunk-loading.patch → ...012-Reduce-projectile-chunk-loading.patch b/...013-Reduce-projectile-chunk-loading.patch → ...012-Reduce-projectile-chunk-loading.patch
@@ -40,7 +40,7 @@ index b3dba80e30268f85befd2495cbf5bc5f59a57cde..0b7a43b6f2ec9a69281ff38f9bef6e33
  }
 +
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 1b7cf6d06bdf36f146656727511a461f2520762e..459aee61b519a40d9136546c0d9356562f5757c8 100644
+index a90317100d32974e481e14476843f66997a2cf3a..cd0629581bae5f805842157af36c2d838e01bee3 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -44,6 +44,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {

diff --git a/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch b/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch
diff --git a/...e-ThreadUnsafeRandom-Initialization.patch → ...e-ThreadUnsafeRandom-Initialization.patch b/...e-ThreadUnsafeRandom-Initialization.patch → ...e-ThreadUnsafeRandom-Initialization.patch
@@ -21,7 +21,7 @@ index 18aac3da3c88f33b1a71a5920a8daa27e9723913..f5ee5341fa51855048f3a0b7f2acc491
 
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 418cfbc84115031651970dee7d9f1c988b64c3a7..822f0ea428f8aeed4e85029fa01178a8e0997ea4 100644
+index 7d54c79f46f99f5500e9cb1f486037cafb27ee3a..a095b16d35588b815475bcd03ecfa3db09db9d20 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -273,6 +273,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

diff --git a/...imize-random-calls-in-chunk-ticking.patch → ...imize-random-calls-in-chunk-ticking.patch b/...imize-random-calls-in-chunk-ticking.patch → ...imize-random-calls-in-chunk-ticking.patch
@@ -34,7 +34,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 75b0278fa8f7522ee6b8905d61e6fc0eca1a4d5c..6e3b2863f04419ee6914ac3fd4f12a4fe78d16b7 100644
+index 3ee97ad8af60978a73eb78efb3597620ef3ed314..fe1a9c646b09d11e7fa2186afbeb70b680ad2b57 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -556,6 +556,7 @@ public class ServerChunkCache extends ChunkSource {

diff --git a/...er/0017-Dynamic-Activation-of-Brain.patch → ...er/0016-Dynamic-Activation-of-Brain.patch b/...er/0017-Dynamic-Activation-of-Brain.patch → ...er/0016-Dynamic-Activation-of-Brain.patch
@@ -124,7 +124,7 @@ index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..1679f0a3d095a7b758b468c77b6d3a4c
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..f9e8a694c7d20a6f27b71a694d82483dd0698a4c 100644
+index a99d737f71277ea3082816c7a7fc47ab3a201d30..888dc5437ae56367903e98eaa976a99b6c83b772 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -222,10 +222,10 @@ public abstract class Mob extends LivingEntity implements Targeting {

diff --git a/...r/0018-Reduce-chunk-loading-lookups.patch → ...r/0017-Reduce-chunk-loading-lookups.patch b/...r/0018-Reduce-chunk-loading-lookups.patch → ...r/0017-Reduce-chunk-loading-lookups.patch
diff --git a/patches/server/0020-Flare-Profiler.patch → patches/server/0018-Flare-Profiler.patch b/patches/server/0020-Flare-Profiler.patch → patches/server/0018-Flare-Profiler.patch
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9be6d8075f2a70afd7c80636ea3eca55f90d3d5f..18bd50340f9e511781dae123cdb82bc16da97d55 100644
+index 5b469c94a40ddb50b3b09ba9f107c1ee2dd29f86..0759c54fadad7abacc71b8199239551a94bb667c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -62,6 +62,7 @@ dependencies {
@@ -819,7 +819,7 @@ index d96399e9bf1a58db5a4a22e58abb99e7660e0694..eb19f679ee498e51d02fe9a961cf0269
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index e948ec5a573b22645664eb53bc3e9932246544e4..e3845dc3357bbb74885ae3a1a08525adde581235 100644
+index e8e93538dfd71de86515d9405f728db1631e949a..3dff02fd97f001508e2f81192817bf1b0ef92446 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -11,6 +11,7 @@ public class ServerShutdownThread extends Thread {

diff --git a/...e-iterators-from-inventory-contains.patch → ...e-iterators-from-inventory-contains.patch b/...e-iterators-from-inventory-contains.patch → ...e-iterators-from-inventory-contains.patch
diff --git a/patches/server/0019-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0019-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/...urn-optimization-for-target-finding.patch → ...urn-optimization-for-target-finding.patch b/...urn-optimization-for-target-finding.patch → ...urn-optimization-for-target-finding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Early return optimization for target finding
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-index a7575b5ef56af6f53448d391abb4956e130148ca..e752c83df50fb9b670ecea2abc95426c2a009b6f 100644
+index 58422f00c7d64dbd1cf6d7211c9838875cbe7778..d25307ae8bbdf10ae067ec70fc2cb957b852a0eb 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 @@ -75,9 +75,18 @@ public class TargetingConditions {