Swap from dev to org domain

build.gradle.kts

@@ -85,7 +85,7 @@ paperweight {
 }
 
 tasks.generateDevelopmentBundle {
-    apiCoordinates.set("dev.graphitemc.graphite:graphite-api")
+    apiCoordinates.set("org.graphitemc.graphite:graphite-api")
     mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
     libraryRepositories.set(
         listOf(
@@ -99,8 +99,8 @@ tasks.generateDevelopmentBundle {
 allprojects {
     publishing {
         repositories {
-            maven("https://repo.purpurmc.org/snapshots") {
-                name = "graphite"
+            maven("https://repo.graphitemc.org/releases") {
+                name = "graphitemc"
                 credentials(PasswordCredentials::class)
             }
         }
@@ -121,7 +121,7 @@ tasks.register("printMinecraftVersion") {
     }
 }
 
-tasks.register("printTentaclesVersion") {
+tasks.register("printGraphiteVersion") {
     doLast {
         println(project.version)
     }

gradle.properties

@@ -1,4 +1,4 @@
-group = dev.graphitemc.graphite
+group = org.graphitemc.graphite
 version = 1.20.1-R0.1-SNAPSHOT
 
 purpurCommit = 41b121b718222d9aa06738ba488a1307deb8c4d0

patches/server/0001-Rebrand.patch → patches/server/0001-Graphite-Rebrand.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Encode42 <[email protected]>
 Date: Thu, 16 Sep 2021 20:39:45 -0400
-Subject: [PATCH] Rebrand
+Subject: [PATCH] Graphite Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
@@ -101,15 +101,15 @@ index 81aee45085a29ceb8e36d7948432e2ca688978c0..7fd37983efee051b7e8dc07618950afa
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..86a1555be54da450a214880b38c21c62150f6d1c 100644
+index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..65dc12643d7533cbfa4813ce38baf353a9c36170 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/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/dev.graphitemc.graphite/graphite-api/pom.properties"); // Pufferfish // Purpur // Graphite
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.graphitemc.graphite/graphite-api/pom.properties"); // Pufferfish // Purpur // Graphite
          Properties properties = new Properties();
 
          if (stream != null) {

patches/server/0003-Disable-Reload-Commands.patch

@@ -5,19 +5,42 @@ Subject: [PATCH] Disable Reload Commands
 
 Disable all reload commands from Bukkit, Spigot, Paper, Purpur and Graphite
 
-diff --git a/src/main/java/dev/graphitemc/graphite/command/ReloadCommand.java b/src/main/java/dev/graphitemc/graphite/command/ReloadCommand.java
-index cb1774130d3a50ca7507f855e1b7b3e21b1437d1..5d8ac5829a3f6686779dc8f861989a0042832650 100644
---- a/src/main/java/dev/graphitemc/graphite/command/ReloadCommand.java
-+++ b/src/main/java/dev/graphitemc/graphite/command/ReloadCommand.java
-@@ -1,6 +1,8 @@
- package dev.graphitemc.graphite.command;
+diff --git a/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
+index bd68139ae635f2ad7ec8e7a21e0056a139c4c62e..f87079e67d86d717b62eee045e615719b47fc68f 100644
+--- a/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
++++ b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
+@@ -21,6 +21,13 @@ public final class ReloadCommand implements PaperSubcommand {
+     }
+
+     private void doReload(final CommandSender sender) {
++        // Graphite start - Disable Reload Commands
++        if (org.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disableCommands) {
++            Command.broadcastCommandMessage(sender, net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(
++                    org.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disabledMessage));
++            return;
++        }
++        // Graphite end - Disable Reload Commands
+         Command.broadcastCommandMessage(sender, text("Please note that this command is not supported and may cause issues.", RED));
+         Command.broadcastCommandMessage(sender, text("If you encounter any issues please use the /stop command to restart your server.", RED));
+
+diff --git a/src/main/java/org/graphitemc/graphite/command/ReloadCommand.java b/src/main/java/org/graphitemc/graphite/command/ReloadCommand.java
+index 80cf80306c6c83c9556c596a2a15da29b3951f0d..1814362388a06ea4d47ee92907fb72e21c549cc9 100644
+--- a/src/main/java/org/graphitemc/graphite/command/ReloadCommand.java
++++ b/src/main/java/org/graphitemc/graphite/command/ReloadCommand.java
+@@ -1,11 +1,13 @@
+ package org.graphitemc.graphite.command;
 
-+import dev.graphitemc.graphite.configuration.GlobalConfiguration;
  import net.kyori.adventure.text.format.NamedTextColor;
 +import net.kyori.adventure.text.minimessage.MiniMessage;
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.command.Command;
+ import org.bukkit.command.CommandSender;
+ import org.bukkit.craftbukkit.CraftServer;
++import org.graphitemc.graphite.configuration.GlobalConfiguration;
+
+ import static net.kyori.adventure.text.Component.text;
+
 @@ -13,6 +15,11 @@ public class ReloadCommand implements GraphiteSubCommand {
 
      @Override
@@ -30,10 +53,10 @@ index cb1774130d3a50ca7507f855e1b7b3e21b1437d1..5d8ac5829a3f6686779dc8f861989a00
          Command.broadcastCommandMessage(sender, text("Please note that this command is not supported and may cause issues.", NamedTextColor.RED));
          Command.broadcastCommandMessage(sender, text("If you encounter any issues pleas use the /stop command to restart your server.", NamedTextColor.RED));
 
-diff --git a/src/main/java/dev/graphitemc/graphite/configuration/GlobalConfiguration.java b/src/main/java/dev/graphitemc/graphite/configuration/GlobalConfiguration.java
-index 0b53bce45408148b94ca7f341f57d26b96333b15..0831a6a70dc3785f3c4f74f68074f3851723254e 100644
---- a/src/main/java/dev/graphitemc/graphite/configuration/GlobalConfiguration.java
-+++ b/src/main/java/dev/graphitemc/graphite/configuration/GlobalConfiguration.java
+diff --git a/src/main/java/org/graphitemc/graphite/configuration/GlobalConfiguration.java b/src/main/java/org/graphitemc/graphite/configuration/GlobalConfiguration.java
+index 9ae5b00a7e8c7286ac310c52f0e4b6514da0e01e..f164304700b51cc2c2b4e3c9131aecccd2f62bda 100644
+--- a/src/main/java/org/graphitemc/graphite/configuration/GlobalConfiguration.java
++++ b/src/main/java/org/graphitemc/graphite/configuration/GlobalConfiguration.java
 @@ -20,4 +20,17 @@ public class GlobalConfiguration extends ConfigurationPart {
      @Setting(Configuration.VERSION_FIELD)
      public int version = CURRENT_VERSION;
@@ -52,54 +75,36 @@ index 0b53bce45408148b94ca7f341f57d26b96333b15..0831a6a70dc3785f3c4f74f68074f385
 +    }
 +
  }
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-index bd68139ae635f2ad7ec8e7a21e0056a139c4c62e..eb4e228bb4cee7b8c2f59a78d8c59e63119e8877 100644
---- a/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-+++ b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-@@ -21,6 +21,13 @@ public final class ReloadCommand implements PaperSubcommand {
-     }
-
-     private void doReload(final CommandSender sender) {
-+        // Graphite start - Disable Reload Commands
-+        if (dev.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disableCommands) {
-+            Command.broadcastCommandMessage(sender, net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(
-+                    dev.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disabledMessage));
-+            return;
-+        }
-+        // Graphite end - Disable Reload Commands
-         Command.broadcastCommandMessage(sender, text("Please note that this command is not supported and may cause issues.", RED));
-         Command.broadcastCommandMessage(sender, text("If you encounter any issues please use the /stop command to restart your server.", RED));
-
 diff --git a/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java b/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java
-index 2621e54879e9ab0029a875f1d09eee67878b90d5..1fa577b5d88bb070f7b3effb9c3df5fc9ba59a8e 100644
+index 2621e54879e9ab0029a875f1d09eee67878b90d5..dabbb67ab246ecfb01f9a9840e9a74a8b64c826e 100644
 --- a/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java
 +++ b/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java
 @@ -42,6 +42,13 @@ public class PurpurCommand extends Command {
          }
 
          if (args[0].equalsIgnoreCase("reload")) {
 +            // Graphite start - Disable Reload Commands
-+            if (dev.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disableCommands) {
++            if (org.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disableCommands) {
 +                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(
-+                        dev.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disabledMessage));
++                        org.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disabledMessage));
 +                return true;
 +            }
 +            // Graphite end - Disable Reload Commands
              Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues.");
              Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
 
 diff --git a/src/main/java/org/spigotmc/SpigotCommand.java b/src/main/java/org/spigotmc/SpigotCommand.java
-index 3112a8695639c402e9d18710acbc11cff5611e9c..53efee1cf2c0d3d22ca50059415d955f8f1b26f5 100644
+index 3112a8695639c402e9d18710acbc11cff5611e9c..eeb00701f27ef4cde4e00640ae357cbbcdcc23c4 100644
 --- a/src/main/java/org/spigotmc/SpigotCommand.java
 +++ b/src/main/java/org/spigotmc/SpigotCommand.java
 @@ -26,6 +26,13 @@ public class SpigotCommand extends Command {
          }
 
          if (args[0].equals("reload")) {
 +            // Graphite start - Disable Reload Commands
-+            if (dev.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disableCommands) {
++            if (org.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disableCommands) {
 +                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(
-+                        dev.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disabledMessage));
++                        org.graphitemc.graphite.configuration.GlobalConfiguration.get().serverOptions.serverReloading.disabledMessage));
 +                return true;
 +            }
 +            // Graphite end - Disable Reload Commands

patches/server/0004-Iron-Golems-Attack-Creepers.patch

@@ -5,29 +5,6 @@ Subject: [PATCH] Iron Golems Attack Creepers
 
 Iron Golems can now attack Creepers
 
-diff --git a/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java b/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-index eafc72ea2e80c627bfe3957f72502cbd1cb5da5c..4b285cfd9aab4fbac044f2922ba0a4a5f701a731 100644
---- a/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-+++ b/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-@@ -22,4 +22,18 @@ public class LevelConfigurations extends ConfigurationPart {
-     @Setting(Configuration.VERSION_FIELD)
-     public int version = CURRENT_VERSION;
-
-+    public MobOptions mobSettings;
-+
-+    public class MobOptions extends ConfigurationPart {
-+
-+        public IronGolemOptions ironGolemOptions;
-+
-+        public class IronGolemOptions extends ConfigurationPart {
-+
-+            public boolean attackCreepers = false;
-+
-+        }
-+
-+    }
-+
- }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 index 64aba511e615983988cdb6a0fd45b7d9d4f2f16d..f38e4fdb7d1ce53856f574005d38a1f412300950 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
@@ -81,3 +58,26 @@ index 64aba511e615983988cdb6a0fd45b7d9d4f2f16d..f38e4fdb7d1ce53856f574005d38a1f4
      }
 
      @Override
+diff --git a/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java b/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
+index 8fc66aa982820b3179e1216f3176f6e8d1079a16..61b5700455933afe0ac3d5c9431bc2e978a79337 100644
+--- a/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
++++ b/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
+@@ -22,4 +22,18 @@ public class LevelConfigurations extends ConfigurationPart {
+     @Setting(Configuration.VERSION_FIELD)
+     public int version = CURRENT_VERSION;
+
++    public MobOptions mobSettings;
++
++    public class MobOptions extends ConfigurationPart {
++
++        public IronGolemOptions ironGolemOptions;
++
++        public class IronGolemOptions extends ConfigurationPart {
++
++            public boolean attackCreepers = false;
++
++        }
++
++    }
++
+ }

patches/server/0005-Fix-MC-31819.patch

@@ -5,10 +5,22 @@ Subject: [PATCH] Fix MC-31819
 
 See: https://bugs.mojang.com/browse/MC-31819
 
-diff --git a/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java b/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-index 4b285cfd9aab4fbac044f2922ba0a4a5f701a731..d65705e77fab5e8f2e75f304b8bcba77c786c11e 100644
---- a/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-+++ b/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index d00035e31cf4773a418d1cc6a6018d08e6b558f0..528feae2ca2d30149f46b8307cce9990644f9aa9 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -1968,6 +1968,7 @@ public abstract class Player extends LivingEntity {
+     }
+
+     public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {
++        if (this.level().graphiteConfiguration().misc.fixMC31819 && this.level().getDifficulty() == Difficulty.PEACEFUL) return; // Graphite - Fix MC-31819
+         // CraftBukkit end
+         if (!this.abilities.invulnerable) {
+             if (!this.level().isClientSide) {
+diff --git a/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java b/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
+index 61b5700455933afe0ac3d5c9431bc2e978a79337..66a13e262bf1b055b6602a7ce24bcc6dab40c470 100644
+--- a/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
++++ b/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
 @@ -36,4 +36,12 @@ public class LevelConfigurations extends ConfigurationPart {
 
      }
@@ -22,15 +34,3 @@ index 4b285cfd9aab4fbac044f2922ba0a4a5f701a731..d65705e77fab5e8f2e75f304b8bcba77
 +    }
 +
  }
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d00035e31cf4773a418d1cc6a6018d08e6b558f0..528feae2ca2d30149f46b8307cce9990644f9aa9 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1968,6 +1968,7 @@ public abstract class Player extends LivingEntity {
-     }
-
-     public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {
-+        if (this.level().graphiteConfiguration().misc.fixMC31819 && this.level().getDifficulty() == Difficulty.PEACEFUL) return; // Graphite - Fix MC-31819
-         // CraftBukkit end
-         if (!this.abilities.invulnerable) {
-             if (!this.level().isClientSide) {

patches/server/0006-Fix-MC-93018.patch

@@ -5,18 +5,6 @@ Subject: [PATCH] Fix MC-93018
 
 See: https://bugs.mojang.com/browse/MC-93018
 
-diff --git a/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java b/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-index d65705e77fab5e8f2e75f304b8bcba77c786c11e..bbf2465be21ac530018267047c96d3309abd15d2 100644
---- a/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-+++ b/src/main/java/dev/graphitemc/graphite/configuration/LevelConfigurations.java
-@@ -41,6 +41,7 @@ public class LevelConfigurations extends ConfigurationPart {
-     public class Miscellaneous extends ConfigurationPart {
-
-         public boolean fixMC31819 = true;
-+        public boolean fixMC93018 = true;
-
-     }
-
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 index 64bceae4d06b35fcbecb0daca2496ba30e39d995..12c55b595ac8edc4fe078d7e8ebf26937771f534 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -51,3 +39,15 @@ index 64bceae4d06b35fcbecb0daca2496ba30e39d995..12c55b595ac8edc4fe078d7e8ebf2693
      }
 
      public boolean isInterested() {
+diff --git a/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java b/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
+index 66a13e262bf1b055b6602a7ce24bcc6dab40c470..0cc2500677721c57a636242df01784a4e8906eca 100644
+--- a/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
++++ b/src/main/java/org/graphitemc/graphite/configuration/LevelConfigurations.java
+@@ -41,6 +41,7 @@ public class LevelConfigurations extends ConfigurationPart {
+     public class Miscellaneous extends ConfigurationPart {
+
+         public boolean fixMC31819 = true;
++        public boolean fixMC93018 = true;
+
+     }
+