Use Pufferfish upstream

Author: froobynooby

build.gradle.kts

@@ -62,7 +62,7 @@ paperweight {
     remapRepo.set("https://maven.fabricmc.net/")
     decompileRepo.set("https://files.minecraftforge.net/maven/")
 
-    usePaperUpstream(providers.gradleProperty("paperRef")) {
+/*    usePaperUpstream(providers.gradleProperty("paperRef")) {
         withPaperPatcher {
             apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
             apiOutputDir.set(layout.projectDirectory.dir("nabulus-api"))
@@ -77,9 +77,9 @@ paperweight {
             patchDir = layout.projectDirectory.dir("patches/generated-api")
             outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
         }
-    }
+    } */
 
-/*    useStandardUpstream("pufferfish") {
+    useStandardUpstream("pufferfish") {
         url.set(github("pufferfish-gg", "Pufferfish"))
         ref.set(providers.gradleProperty("paperRef"))
 
@@ -101,7 +101,7 @@ paperweight {
             outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
         }
     }
-*/
+
 }
 
 //

gradle.properties

@@ -2,7 +2,7 @@ group=com.froobworld.nabulus
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=df3b6544f74be73c8882b97c43d39022340f2d74
+paperRef=12571ebabc06c898ce700f4c2b979b95da0db7ff
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0001-Nabulus-branding.patch

@@ -5,44 +5,44 @@ Subject: [PATCH] Nabulus branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..f5993f68bf0dd92b1e39b1a1028fe5d405380788 100644
+index 46d58f871c98a9b86f1a03a291cac40031a63e0d..9ec739da24ec5fb1143d9cfa0bb44c8e3bd86a20 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
  val alsoShade: Configuration by configurations.creating
 
  dependencies {
--    implementation(project(":paper-api"))
+-    implementation(project(":pufferfish-api")) // Pufferfish // Paper
 +    implementation(project(":nabulus-api")) // Nabulus
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -84,14 +84,14 @@ tasks.jar {
+@@ -100,14 +100,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
--            "Implementation-Title" to "Paper",
+-            "Implementation-Title" to "Pufferfish", // Pufferfish
 +            "Implementation-Title" to "Nabulus", // Nabulus
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Paper",
+             "Specification-Title" to "Pufferfish", // Pufferfish
              "Specification-Version" to project.version,
-             "Specification-Vendor" to "Paper Team",
-             "Brand-Id" to "papermc:paper",
--            "Brand-Name" to "Paper",
-+            "Brand-Name" to "Nabulus", // Nabulus
+             "Specification-Vendor" to "Pufferfish Studios LLC", // Pufferfish
+             "Brand-Id" to "pufferfish:pufferfish", // Pufferfish
+-            "Brand-Name" to "Pufferfish", // Pufferfish
++            "Brand-Name" to "Nabulus", // Pufferfish // Nabulus
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..df1fe60f2f26b1dae0a724cb55a2337d75c7d7a4 100644
+index 80553face9c70c2a3d897681e7761df85b22d464..df1fe60f2f26b1dae0a724cb55a2337d75c7d7a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
      public static String getBukkitVersion() {
          String result = "Unknown-Version";
 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish
 +        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.froobworld.nabulus/nabulus-api/pom.properties"); // Nabulus
          Properties properties = new Properties();
 

patches/server/0002-Separate-creative-levels.patch

@@ -124,10 +124,10 @@ index 43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5..3ae3ba6a0f048cdfe870e1ea2d1ee679
          if (dimensiontransition == null) {
              return entityplayer;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1f7594e22f0f08ae110ef9b42f15119358aa5723..0c65c46a6b0ee1ef71a13f715294385a20b0be27 100644
+index 3f7812c55dae82433336d6e091aa83434615fa04..57e95261d53ef97525ec623eb90ad3c317195b8f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3722,6 +3722,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3731,6 +3731,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          // Paper end - Fix item duplication and teleport issues
          if (world instanceof ServerLevel worldserver) {
              if (!this.isRemoved()) {

patches/server/0007-Throttle-spawn-attempts-after-consistent-failures.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Throttle spawn attempts after consistent failures
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index ed8032495af9ce9c23419224814b8d27e4a97c17..318c8ea92795ebed7af765a5c2c6a73a10106572 100644
+index e524b27d185da3e88668f8ef107517272860bd66..545109edc80c4c48d1e12398aa2161bf71e92665 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -139,9 +139,10 @@ public final class NaturalSpawner {
@@ -35,7 +35,7 @@ index ed8032495af9ce9c23419224814b8d27e4a97c17..318c8ea92795ebed7af765a5c2c6a73a
          }
 
 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 435f5f0a17901f743bd565b28f9feb5d4058c819..2c012357bc23f73fda4fc0ba20e96ec6c5e6b672 100644
+index 8ccd3b8fcaa80f60b91a6c066e312542d349246a..7bf5219bb846f0f8b57fda04f189a6f45f3bb65e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -85,6 +85,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
@@ -44,5 +44,5 @@ index 435f5f0a17901f743bd565b28f9feb5d4058c819..2c012357bc23f73fda4fc0ba20e96ec6
      private final LevelChunkTicks<Fluid> fluidTicks;
 +    public final Map<net.minecraft.world.entity.MobCategory, Integer> failedSpawnAttempts = new java.util.EnumMap<>(net.minecraft.world.entity.MobCategory.class); // Nabulus
 
-     public LevelChunk(Level world, ChunkPos pos) {
-         this(world, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, (LevelChunkSection[]) null, (LevelChunk.PostLoadProcessor) null, (BlendingData) null);
+     // Pufferfish start - instead of using a random every time the chunk is ticked, define when lightning strikes preemptively
+     private int lightningTick;

patches/server/0010-Allow-players-to-hide-wither-boss-bar.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow players to hide wither boss bar
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 7ddca52f7fe3f289b4b867e134326b1ead1a2aee..fe9c1e93295a6311abe56091ba329f7d5885c742 100644
+index 82921c56c49edb0ca07425da563aa4876d4e6fb1..83b2788fe8a5d12a4c73056110e3a922253c79d5 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -93,6 +93,21 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -38,7 +38,7 @@ index 7ddca52f7fe3f289b4b867e134326b1ead1a2aee..fe9c1e93295a6311abe56091ba329f7d
          this.bossEvent.setName(this.getDisplayName());
      }
 
-@@ -415,7 +431,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -422,7 +438,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
      @Override
      public void startSeenByPlayer(ServerPlayer player) {
          super.startSeenByPlayer(player);