Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d8d59e0 Fix NPE sending resource pack without prompt
PaperMC/Paper@5a9afbe Fixes issues in the suppress dismount cancellation patch (#10735)
PaperMC/Paper@0ad09de Make PaperSimplePluginClassLoader show class which is not found
PaperMC/Paper@b3b3406 fix CompassMeta not being correct (#10737)
PaperMC/Paper@591521e Check for more correct profile validation (#10730)
PaperMC/Paper@7d2e5c3 Add an 'empty' RecipeChoice for certain ingredient slots (#10710)
PaperMC/Paper@9bf4855 Add a better warning message than "Server performance will be affected" for CommandRegisteredEvent use (#10754)
PaperMC/Paper@66cb880 Remove ThreadedWorldUpgrader patch
PaperMC/Paper@980cff9 Fix compile
PaperMC/Paper@d3ffa62 fix default item attributes
PaperMC/Paper@b149584 Always show command exception stack traces in logs (#10766)
PaperMC/Paper@a9201d4 Move logic in our patches to ItemType/BlockType (#10772)
PaperMC/Paper@3de408e Fix equipment slot and group API (#10767)
PaperMC/Paper@d408381 Print CommandRegisteredEvent deprecation warnings again (#10756)
PaperMC/Paper@6de7a1f Improve default item attributes API (#10765)
PaperMC/Paper@2a90732 Remove incorrect logic for Fireball#setVelocity (#10764)
PaperMC/Paper@5e7b65a Allow using PluginLoader classpath API from Bukkit plugins (#10758)
PaperMC/Paper@3004717 Do not re-wrap vanilla goals (#10751)
PaperMC/Paper@377733d Use getter/setter on Mob for equipment drop chances (#10780)
PaperMC/Paper@dff591d Allow to define new map cursor types (#10782)
PaperMC/Paper@4fd3ac0 Update Player#getListeningPluginChannels Jdoc (#10778)
PaperMC/Paper@535dca5 Fix a few issues with ItemMeta (#10740)
PaperMC/Paper@26e90b9 Fix CraftMetaBlockState for data components (#10731)
PaperMC/Paper@f0bd0cc Expose anvil cost in the API (#10682)
PaperMC/Paper@41bee55 Fix NPE for color-related metas
PaperMC/Paper@4e10fad reset meta block state on BlockStateMeta#setBlockState
PaperMC/Paper@a7ae966 readd itemstack data sanitization (#10454)
PaperMC/Paper@ca50b87 Clear firework item properly (#10793)
PaperMC/Paper@9774a52 fix and cleanup loot table patches (#10100)
PaperMC/Paper@ac4ee06 Fix integer overflow for lag compensating eating check (#10797)
PaperMC/Paper@6649a17 Fix BlockStateMeta equals (#10795)
PaperMC/Paper@1b8cdc6 Extend Player Interact cancellation to cover Jigsaw blocks (#10719)
PaperMC/Paper@841ab41 Fix more item desync when an event is cancelled (#10654)
PaperMC/Paper@b0e3ca4 Prevent NPE if hooked entity was cleared (#10712)
PaperMC/Paper@347bbe3 Fix Cancelling BlockPlaceEvent calling onRemove (#10773)

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
 packageVersion = 1_20_R4
-paperRef = f17519338bc589c045e0b32bfc37e048b23544d5
+paperRef = 347bbe389786d5cdae7cd1c6ec32cacba2a9aac7
 
 org.gradle.jvmargs = -Xmx2G
 

patches/server/0003-Change-branding.patch

@@ -70,15 +70,15 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..111dcc7284166e7d5e7014ecf00df48a
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..8735c0b8e599d226d4a2d9ae15e18a903b73e422 100644
+index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..443b4702dda601962e7e59cdf2f22002837d6542 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 @@ -35,7 +35,7 @@ public class PaperVersionFetcher implements VersionFetcher {
      private static final Logger LOGGER = LogUtils.getClassLogger();
      private static final int DISTANCE_ERROR = -1;
      private static final int DISTANCE_UNKNOWN = -2;
 -    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+    private static final String DOWNLOAD_PAGE = "https://dl.cloudcraftmc.de/r/cloudplane"; // CloudPlane
++    private static final String DOWNLOAD_PAGE = "https://dl.cloudcraftmc.de/CloudPlane"; // CloudPlane
 
      @Override
      public long getCacheTime() {
@@ -92,15 +92,15 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..8735c0b8e599d226d4a2d9ae15e18a90
          final @Nullable Component history = this.getHistory();
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e02102280ed1dc300191d19bbca8f00e17701753..00309c8e383d77a1263cb247b1c896f99ff32722 100644
+index e02102280ed1dc300191d19bbca8f00e17701753..fa1c94da6894d37a9d986c1d32aac73ce4bf312d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -303,7 +303,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
-+                        System.err.println("*** Please download a new build as per instructions from https://dl.cloudcraftmc.de/r/cloudplane ***"); // Paper // CloudPlane
++                        System.err.println("*** Please download a new build as per instructions from https://dl.cloudcraftmc.de/CloudPlane ***"); // Paper // CloudPlane
                          //System.err.println("*** Server will start in 20 seconds ***");
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper end

patches/server/0004-Add-CloudPlane-configuration.patch

@@ -225,10 +225,10 @@ index 6fb2a857d65d7b5de5fd8da224aa8dda79fe3505..b69eeb58eb93869ed1637b7e98eededf
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cd00bac90d289a770e5c2723b36462a3d7bda88f..535f000000a9670e07713deda82c2f47f9730859 100644
+index fdd51dd4a244775a1a172ae435be087a90a03e68..59c135fb5fe94bb0266be319885f0104525c8098 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -226,10 +226,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -218,10 +218,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      private final int height;
      private final int maxBuildHeight;
      // Pufferfish end
@@ -242,7 +242,7 @@ index cd00bac90d289a770e5c2723b36462a3d7bda88f..535f000000a9670e07713deda82c2f47
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 978f29a76af86e3e1397551d79cdec4fecec071a..09144d69edf6e2f90378d37a3d3434f61af9c015 100644
+index eca42acc4dd92d0466e2625191b814038f748f30..98cdffe03b6dcb3c733040ed815f5deca47ac234 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
@@ -253,7 +253,7 @@ index 978f29a76af86e3e1397551d79cdec4fecec071a..09144d69edf6e2f90378d37a3d3434f6
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -3039,6 +3040,13 @@ public final class CraftServer implements Server {
+@@ -3034,6 +3035,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -268,7 +268,7 @@ index 978f29a76af86e3e1397551d79cdec4fecec071a..09144d69edf6e2f90378d37a3d3434f6
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 00309c8e383d77a1263cb247b1c896f99ff32722..f5439b615b7a9d5317647b723120c86e3616007e 100644
+index fa1c94da6894d37a9d986c1d32aac73ce4bf312d..d853454c04dd1abf6e535bedd29b468d3669f198 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -176,6 +176,14 @@ public class Main {

patches/server/0012-Resend-more-data-on-locale-change.patch

@@ -27,7 +27,7 @@ index c7e1f2bac3eca9bb72bf1f8c26cccb2905e1ddfc..4ce4479619cc189e1d6999537deaceff
          this.player = owner;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 856fc37dddaf0bf76f9f8396524488ac077f5bf8..a2fe2f667046220ae802326e9c765f0e05ffe284 100644
+index 2ca184235af8a3934f9797231a6191aa7755a527..5d1dcc1328df8e2ec7380db6afbab37a94d8cfaa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -346,6 +346,10 @@ public class ServerPlayer extends Player {
@@ -41,7 +41,7 @@ index 856fc37dddaf0bf76f9f8396524488ac077f5bf8..a2fe2f667046220ae802326e9c765f0e
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
-@@ -2242,6 +2246,34 @@ public class ServerPlayer extends Player {
+@@ -2243,6 +2247,34 @@ public class ServerPlayer extends Player {
              PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), clientOptions.language());
              this.server.server.getPluginManager().callEvent(event);
              this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
@@ -90,10 +90,10 @@ index a658943669cdfd49f66ba713505d11b33306ed86..f3a3fd37de7660738ef843f226a30fed
          public static final EntityDataAccessor<Integer> DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(
              Display.TextDisplay.class, EntityDataSerializers.INT
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2abb9194ea04918961774bc1d9f0ee291586e253..5eab41f6e3a4379d5efd0eeff9522b23cf9ee1ef 100644
+index 3509f92ce7007cb57d57274f89d5957b488b8559..49586b18d8500aeef17529e73557d60aa74f41c2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -360,7 +360,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -359,7 +359,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      protected static final int FLAG_GLOWING = 6;
      protected static final int FLAG_FALL_FLYING = 7;
      private static final EntityDataAccessor<Integer> DATA_AIR_SUPPLY_ID = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.INT);

settings.gradle.kts

@@ -1,6 +1,7 @@
+rootProject.name = "CloudPlane"
+
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
-rootProject.name = "CloudPlane"
 include("CloudPlane-API", "CloudPlane-Server", "test-plugin")