Updated Upstream ()

Upstream has released updates that appear to apply and compile correctly

gradle.properties

@@ -1,7 +1,7 @@
 group = org.graphitemc.graphite
 version = 1.20.1-R0.1-SNAPSHOT
 
-purpurCommit = 41b121b718222d9aa06738ba488a1307deb8c4d0
+purpurCommit = 41ab912b5bcccecb3e8a85124369006bd673b718
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Graphite-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Graphite Configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 916b9a9f05c0e83109bc9a4eb1692e2ed6e81eaf..aaff3484283f5c1dfa742582266f9f47043f331f 100644
+index 615c47f069d429e14993c60253f719b514849a67..5e242de3e52b3ac297f9b34c223ec1dd47e9b2a6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2041,7 +2041,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2092,7 +2092,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Purpur end

patches/api/0004-Player-Skin-API.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Player Skin API
 Ability to change a player's skin easily through new API
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 74a9e27b8d3147876483743e1107632e332b0571..4e76b9e8ac9bd23b7954b07f3ba6e061f21896e6 100644
+index fb99e05b4769af604f41d81f036cee3b8a6ec197..00bcc9b4e6142ae647d91dd346a05ae65772f341 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1018,8 +1018,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1084,8 +1084,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they have seen it before because this method was called.
       * Note this method does not make the player invulnerable, which is normally expected when viewing credits.
       *
@@ -20,7 +20,7 @@ index 74a9e27b8d3147876483743e1107632e332b0571..4e76b9e8ac9bd23b7954b07f3ba6e061
       * @see <a href="https://minecraft.fandom.com/wiki/End_Poem#Technical_details">https://minecraft.fandom.com/wiki/End_Poem#Technical_details</a>
       */
      public void showWinScreen();
-@@ -2638,7 +2638,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2704,7 +2704,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param simulationDistance the player's new simulation distance
       */
      public void setSimulationDistance(int simulationDistance);
@@ -29,7 +29,7 @@ index 74a9e27b8d3147876483743e1107632e332b0571..4e76b9e8ac9bd23b7954b07f3ba6e061
      /**
       * Gets the no-ticking view distance for this player.
       * <p>
-@@ -3314,4 +3314,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3380,4 +3380,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          sendDeathScreen(message);
      }
      // Purpur end

patches/server/0001-Graphite-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Graphite Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 240394b1d9dd1449674a299aa73fa155be2d3d82..5314434786982a812bae952a87b7f52e9de7a19e 100644
+index 139e2b17b899da6f0147bb8b4412e2e54e817be4..e8257d60340fee70112826ea83383d2a142df73f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,12 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -136,10 +136,10 @@ index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..8f770b6d252f2ef6e8dc63c009301297
                  continue;
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 81aee45085a29ceb8e36d7948432e2ca688978c0..7fd37983efee051b7e8dc07618950afa40987e5a 100644
+index 60fbac7b09ba7de1127d53ba296ea7b843105b2a..d2bff98d1e2b137db9891f32703086c6d47b0fb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -162,7 +162,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..65dc12643d7533cbfa4813ce38baf353
 
          if (stream != null) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index b974b59d421cf97bc9547ea75fe4643d89639bc1..87017387e100ec5ee724e69b56f31e9a64852691 100644
+index f03aba5c25896677d9d37e3fa010590b1ab7e3b6..b14ed650d37eba870829dc22a46d86bc2659c502 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -229,7 +229,7 @@ public class PurpurConfig {

patches/server/0002-Graphite-Configuration.patch

@@ -262,7 +262,7 @@ index 221d1d0e1b4b46de6ebca5faac09bbda875fae17..c6b9451b60f117ef6d6cb5f63d9d5b57
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..d4bc1cfa4f71cc2e4913650fc40894563543d40a 100644
+index 8f770b6d252f2ef6e8dc63c0093012978de565dc..b1a32fbfc51e4daa1ea36a4482c42ceb7617b418 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -328,9 +328,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -290,7 +290,7 @@ index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..d4bc1cfa4f71cc2e4913650fc4089456
 +    // Graphite end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7fd37983efee051b7e8dc07618950afa40987e5a..5b6bde24fae0f54fff3a2de5f3bb3e64254dd718 100644
+index d2bff98d1e2b137db9891f32703086c6d47b0fb7..a5bd34d71a2097cd1541917d45ab34a70d09b4ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -24,7 +24,6 @@ import java.io.FileNotFoundException;
@@ -300,32 +300,32 @@ index 7fd37983efee051b7e8dc07618950afa40987e5a..5b6bde24fae0f54fff3a2de5f3bb3e64
 -import java.net.InetSocketAddress;
  import java.util.ArrayList;
  import java.util.Collections;
- import java.util.HashMap;
-@@ -242,7 +241,6 @@ import org.bukkit.plugin.PluginManager;
+ import java.util.Date;
+@@ -243,7 +242,6 @@ import org.bukkit.plugin.PluginManager;
  import org.bukkit.plugin.ServicesManager;
  import org.bukkit.plugin.SimplePluginManager;
  import org.bukkit.plugin.SimpleServicesManager;
 -import org.bukkit.plugin.java.JavaPluginLoader;
  import org.bukkit.plugin.messaging.Messenger;
  import org.bukkit.plugin.messaging.StandardMessenger;
  import org.bukkit.potion.Potion;
-@@ -1070,6 +1068,7 @@ public final class CraftServer implements Server {
+@@ -1071,6 +1069,7 @@ public final class CraftServer implements Server {
 
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
 +        this.console.graphiteConfigurations.reloadConfigs(this.console); // Graphite
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-@@ -1102,6 +1101,7 @@ public final class CraftServer implements Server {
+@@ -1103,6 +1102,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
 +        org.graphitemc.graphite.command.GraphiteCommands.registerCommands(this.console); // Graphite
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
-@@ -2947,6 +2947,12 @@ public final class CraftServer implements Server {
+@@ -2985,6 +2985,12 @@ public final class CraftServer implements Server {
              return getProperties().properties;
          }
          // Purpur end
@@ -339,7 +339,7 @@ index 7fd37983efee051b7e8dc07618950afa40987e5a..5b6bde24fae0f54fff3a2de5f3bb3e64
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0bc9b176a3b86a5b4153a2110621534c692d8240..a33431ffd4e524f088840aefdd0b2444193196b8 100644
+index 9a3374a1236164194ef0df43ed639296cbe1c731..3d235b51c4707a414d6118733f96753363b7ba22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -186,6 +186,13 @@ public class Main {

patches/server/0007-Raw-Ore-Block-Smelting.patch

@@ -95,10 +95,10 @@ index 997d0fab71eacc6466ffe3bc8f6349e5813d6d49..a26c1556c7d5995c424f0719379b047e
 +    // Graphite end - Smelt Raw Ore Blocks
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b6bde24fae0f54fff3a2de5f3bb3e64254dd718..1f4414ef0c12448259c7f5fd0e3dc5e45825cc30 100644
+index a5bd34d71a2097cd1541917d45ab34a70d09b4ca..b21cd4b8417bbb3f4edcf0a0e43ed8d3585e932e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1102,6 +1102,7 @@ public final class CraftServer implements Server {
+@@ -1103,6 +1103,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          org.graphitemc.graphite.command.GraphiteCommands.registerCommands(this.console); // Graphite

patches/server/0008-Player-Skin-API.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Player Skin API
 Ability to change a player's skin easily through new API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 95bc2947ac44fa46f11c528da7f241ba410b7eb6..912dc8f86e189dde6f98fc82c624e236cf2a6753 100644
+index cdbbdb3f5a8b43811c564d1444a2b102add3ba72..4008ecb0ff7f454cf6a737e593d535e13e81f7e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3297,4 +3297,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3329,4 +3329,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
      }
      // Purpur end