Push forward

.github/workflows/build-pr.yml

@@ -28,8 +28,8 @@ jobs:
 
       - name: Configure Git User Details
         run: |
-          git config --global user.email "ci-test@monnairealms.moe"
-          git config --global user.name "Camellia Test CI"
+          git config --global user.email "ci-test@nanachiyo0721.moe"
+          git config --global user.name "Shiroha Test CI"
 
       - name: Grant Execute Permission
         run: chmod +x gradlew
@@ -46,14 +46,14 @@ jobs:
             awk -F= -v key="$1" '$1 == key { val = $2; sub(/[[:space:]]*#.*$/, "", val); gsub(/^[[:space:]]+|[[:space:]]+$/, "", val); print val }' gradle.properties
           }
 
-          jarName="camellia-$(prop mcVersion).jar"
-          mv camellia-server/build/libs/camellia-paperclip-"$(prop version)"*.jar "$jarName" 2>/dev/null || \
-          mv camellia-server/build/libs/*-paperclip-*.jar "$jarName" 2>/dev/null || true
+          jarName="shiroha-$(prop mcVersion).jar"
+          mv shiroha-server/build/libs/shiroha-paperclip-"$(prop version)"*.jar "$jarName" 2>/dev/null || \
+          mv shiroha-server/build/libs/*-paperclip-*.jar "$jarName" 2>/dev/null || true
           echo "jar=$jarName" >> "$GITHUB_ENV"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v7
         with:
-          name: ${{ env.jar || 'camellia-pr' }}
-          path: ${{ env.jar || 'camellia-server/build/libs/*-paperclip-*.jar' }}
+          name: ${{ env.jar || 'shiroha-pr' }}
+          path: ${{ env.jar || 'shiroha-server/build/libs/*-paperclip-*.jar' }}
           if-no-files-found: warn

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Camellia CI
+name: Shiroha CI
 
 on:
   push:
@@ -57,7 +57,7 @@ jobs:
           cache-read-only: false
 
       - name: Configure Git User Details
-        run: git config --global user.email "ci@monnairealms.moe" && git config --global user.name "Camellia CI"
+        run: git config --global user.email "ci@nanachiyo0721.moe" && git config --global user.name "Shiroha CI"
 
       - name: Grant Execute Permission
         run: chmod +x gradlew
@@ -80,7 +80,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v7
         with:
-          name: ${{ env.project_id_b || 'Camellia' }} CI Artifacts
+          name: ${{ env.project_id_b || 'Shiroha' }} CI Artifacts
           path: ${{ env.jar_dir }}
           if-no-files-found: warn
 

build.gradle.kts

@@ -14,26 +14,26 @@ paperweight {
 
         patchFile {
             path = "folia-server/build.gradle.kts"
-            outputFile = file("camellia-server/build.gradle.kts")
-            patchFile = file("camellia-server/build.gradle.kts.patch")
+            outputFile = file("shiroha-server/build.gradle.kts")
+            patchFile = file("shiroha-server/build.gradle.kts.patch")
         }
 
         patchFile {
             path = "folia-api/build.gradle.kts"
-            outputFile = file("camellia-api/build.gradle.kts")
-            patchFile = file("camellia-api/build.gradle.kts.patch")
+            outputFile = file("shiroha-api/build.gradle.kts")
+            patchFile = file("shiroha-api/build.gradle.kts.patch")
         }
 
         patchRepo("paperApi") {
             upstreamPath = "paper-api"
-            patchesDir = file("camellia-api/paper-patches")
+            patchesDir = file("shiroha-api/paper-patches")
             outputDir = file("paper-api")
         }
 
         patchDir("foliaApi") {
             upstreamPath = "folia-api"
             excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
-            patchesDir = file("camellia-api/folia-patches")
+            patchesDir = file("shiroha-api/folia-patches")
             outputDir = file("folia-api")
         }
     }

gradle.properties

@@ -1,4 +1,4 @@
-group=moe.monnairealms.camellia
+group=io.nanachiyo0721.shiroha
 mcVersion=26.2
 apiVersion=26.2
 channel=STABLE

scripts/SetENV.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
-# Camellia CI - Environment Setup Script
+# Shiroha CI - Environment Setup Script
 # Reads gradle.properties and sets GitHub Actions environment variables
 
 prop() {
   grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }
 
-project_id="camellia"
-project_id_b="Camellia"
+project_id="shiroha"
+project_id_b="Shiroha"
 
 commitid=$(git log --pretty='%h' -1)
 mcversion=$(prop mcVersion)
@@ -20,7 +20,7 @@ if [ "$run_attempt" = "1" ]; then
 else
   jarName="$project_id-$mcversion-$BUILD_NUMBER-$run_attempt.jar"
 fi
-jarName_dir="camellia-server/build/libs/$jarName"
+jarName_dir="shiroha-server/build/libs/$jarName"
 
 flag_push_repo=false
 flag_release=false
@@ -45,7 +45,7 @@ elif [ "$pushRepo" = "false" ]; then
 fi
 
 # Rename the paperclip jar to a standardized name
-actual_jar=$(ls camellia-server/build/libs/*-paperclip-*.jar 2>/dev/null | head -n 1)
+actual_jar=$(ls shiroha-server/build/libs/*-paperclip-*.jar 2>/dev/null | head -n 1)
 if [ -n "$actual_jar" ]; then
   mv "$actual_jar" "$jarName_dir"
 else

settings.gradle.kts

@@ -18,15 +18,15 @@ plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
-rootProject.name = "camellia"
+rootProject.name = "shiroha"
 
-for (name in listOf("camellia-api", "camellia-server")) {
+for (name in listOf("shiroha-api", "shiroha-server")) {
     include(name)
     file(name).mkdirs()
 }
 
 optionalInclude("test-plugin")
-optionalInclude("camellia-generator")
+optionalInclude("shiroha-generator")
 
 fun optionalInclude(name: String, op: (ProjectDescriptor.() -> Unit)? = null) {
     val settingsFile = file("$name.settings.gradle.kts")
@@ -46,12 +46,12 @@ fun optionalInclude(name: String, op: (ProjectDescriptor.() -> Unit)? = null) {
 
 gradle.lifecycle.beforeProject {
     val mcVersion = providers.gradleProperty("mcVersion").get().trim()
-    val camelliaVersionChannel = providers.gradleProperty("channel").get().trim()
-    val camelliaBuildNumber = providers.environmentVariable("BUILD_NUMBER").orNull?.trim()?.toInt()
-    val versionString = if (camelliaBuildNumber == null) {
+    val shirohaVersionChannel = providers.gradleProperty("channel").get().trim()
+    val shirohaBuildNumber = providers.environmentVariable("BUILD_NUMBER").orNull?.trim()?.toInt()
+    val versionString = if (shirohaBuildNumber == null) {
         "$mcVersion.local-SNAPSHOT"
     } else {
-        "$mcVersion.build.$camelliaBuildNumber-${camelliaVersionChannel.lowercase()}"
+        "$mcVersion.build.$shirohaBuildNumber-${shirohaVersionChannel.lowercase()}"
     }
     version = versionString
 }

shiroha-api/paper-patches/features/0001-Rebrand-to-Shiroha.patch

@@ -20,7 +20,7 @@ index 652ff54e7c50412503725d628bfe72ed03059790..2e10b3f7833960074b2d4c2a670d4d1f
 +    /**
 +     * The brand id for Shiroha.
 +     */
-+    Key BRAND_CAMELLIA_ID = Key.key("monnairealms", "camellia");
++    Key BRAND_CAMELLIA_ID = Key.key("nanachiyo0721", "shiroha");
 +    // Shiroha end
 +
      /**

shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ShirohaConfigBuilder.java

@@ -5,22 +5,22 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 
 /**
- * Builder interface for creating {@link CamelliaConfigsInstance} instances.
+ * Builder interface for creating {@link ShirohaConfigsInstance} instances.
  * <p>
  * Provides multiple overloaded factory methods to construct configuration instances
  * with varying levels of customization, including custom base directories,
  * file names, and command names.
  */
-public interface CamelliaConfigBuilder {
+public interface ShirohaConfigBuilder {
     /**
      * Creates a configuration instance using the default base directory and file name.
      *
      * @param loader the class loader used to load configuration resources
      * @param name   the configuration name identifier
      * @param pack   the package path where configuration classes are located
-     * @return a new {@link CamelliaConfigsInstance}
+     * @return a new {@link ShirohaConfigsInstance}
      */
-    CamelliaConfigsInstance of(
+    ShirohaConfigsInstance of(
             @NotNull ClassLoader loader,
             @NotNull String name,
             @NotNull String pack
@@ -33,9 +33,9 @@ public interface CamelliaConfigBuilder {
      * @param base   the base directory where the configuration file is stored
      * @param name   the configuration name identifier
      * @param pack   the package path where configuration classes are located
-     * @return a new {@link CamelliaConfigsInstance}
+     * @return a new {@link ShirohaConfigsInstance}
      */
-    CamelliaConfigsInstance of(
+    ShirohaConfigsInstance of(
             @NotNull ClassLoader loader,
             @NotNull File base,
             @NotNull String name,
@@ -50,9 +50,9 @@ public interface CamelliaConfigBuilder {
      * @param name      the configuration name identifier
      * @param file_name the configuration file name (without extension)
      * @param pack      the package path where configuration classes are located
-     * @return a new {@link CamelliaConfigsInstance}
+     * @return a new {@link ShirohaConfigsInstance}
      */
-    CamelliaConfigsInstance of(
+    ShirohaConfigsInstance of(
             @NotNull ClassLoader loader,
             @NotNull File base,
             @NotNull String name,
@@ -69,9 +69,9 @@ public interface CamelliaConfigBuilder {
      * @param file_name    the configuration file name (without extension)
      * @param command_name the command name associated with this configuration
      * @param pack         the package path where configuration classes are located
-     * @return a new {@link CamelliaConfigsInstance}
+     * @return a new {@link ShirohaConfigsInstance}
      */
-    CamelliaConfigsInstance of(
+    ShirohaConfigsInstance of(
             @NotNull ClassLoader loader,
             @NotNull File base,
             @NotNull String name,

shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ShirohaConfigsInstance.java

@@ -11,7 +11,7 @@ import java.util.concurrent.CompletableFuture;
  * Interface for managing configuration instances and operations.
  * Provides methods for loading, saving, modifying, and querying configuration values.
  */
-public interface CamelliaConfigsInstance {
+public interface ShirohaConfigsInstance {
     /**
      * Initialize the configuration subsystem for this instance.
      * Implementations should load configuration files, apply defaults and

shiroha-server/build.gradle.kts.patch

@@ -21,23 +21,23 @@
      }
  
 -    activeFork = fork
-+    val camellia = forks.register("camellia") {
++    val shiroha = forks.register("shiroha") {
 +        forks = fork
 +        upstream.patchRepo("paperServer") {
 +            upstreamRepo = fork.patchedRepo("paperServer")
-+            patchesDir = rootDirectory.dir("camellia-server/paper-patches")
++            patchesDir = rootDirectory.dir("shiroha-server/paper-patches")
 +            outputDir = rootDirectory.dir("paper-server")
 +        }
 +
 +        upstream.patchDir("foliaServer") {
 +            upstreamPath = "folia-server"
 +            excludes = setOf("src/minecraft", "paper-patches", "minecraft-patches", "build.gradle.kts", "build.gradle.kts.patch")
-+            patchesDir = rootDirectory.dir("camellia-server/folia-patches")
++            patchesDir = rootDirectory.dir("shiroha-server/folia-patches")
 +            outputDir = rootDirectory.dir("folia-server")
 +        }
 +    }
 +
-+    activeFork = camellia
++    activeFork = shiroha
  
  
      updatingMinecraft {
@@ -70,16 +70,16 @@
  dependencies {
 -    implementation(project(":folia-api"))
 -    implementation("ca.spottedleaf:leafpile:1.0.0")
-+    implementation(project(":camellia-api"))
-+    // Camellia start - dependencies
++    implementation(project(":shiroha-api"))
++    // Shiroha start - dependencies
 +    implementation("com.electronwill.night-config:toml:3.9.0")
 +    implementation("net.openhft:affinity:3.23.3")
 +    implementation("com.github.luben:zstd-jni:1.5.4-1")
 +    implementation("net.openhft:zero-allocation-hashing:0.16")
 +    implementation("net.objecthunter:exp4j:0.4.8")
 +    implementation("io.github.classgraph:classgraph:4.8.158")
-+    // Camellia end
-+    implementation("moe.monnairealms:willowpile:1.0.0") // Camellia - Replace leafpile with willowpile
++    // Shiroha end
++    implementation("moe.monnairealms:willowpile:1.0.0") // Shiroha - Replace leafpile with willowpile
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -96,18 +96,18 @@
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
 -            "Implementation-Title" to "Folia",
-+            "Implementation-Title" to "Camellia",
++            "Implementation-Title" to "Shiroha",
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date,
 -            "Specification-Title" to "Folia",
-+            "Specification-Title" to "Camellia",
++            "Specification-Title" to "Shiroha",
              "Specification-Version" to project.version,
 -            "Specification-Vendor" to "Paper Team",
 -            "Brand-Id" to "papermc:folia",
 -            "Brand-Name" to "Folia",
-+            "Specification-Vendor" to "MonnaiRealms Community",
-+            "Brand-Id" to "monnairealms:camellia",
-+            "Brand-Name" to "Camellia",
++            "Specification-Vendor" to "Nanachiyo0721 Community",
++            "Brand-Id" to "nanachiyo0721:shiroha",
++            "Brand-Name" to "Shiroha",
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
@@ -116,7 +116,7 @@
  
  fill {
 -    project("folia")
-+    project("camellia")
++    project("shiroha")
      versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
      version(paperweight.minecraftVersion)
  

shiroha-server/paper-patches/features/0001-Rebrand-to-Shiroha.patch

@@ -13,7 +13,7 @@ index 08745a35b1ce8cc56d970472088de3cd17b9e43a..287cff1f4d994584457f00b1e42f283e
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
 -                Metrics metrics = new Metrics("Folia", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page
-+                Metrics metrics = new Metrics("Camellia", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page // Shiroha - Rebrand to Shiroha
++                Metrics metrics = new Metrics("Shiroha", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page // Shiroha - Rebrand to Shiroha
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
@@ -22,12 +22,12 @@ index 08745a35b1ce8cc56d970472088de3cd17b9e43a..287cff1f4d994584457f00b1e42f283e
                  if (implVersion != null) {
                      final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
 -                    paperVersion = "git-Folia-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page
-+                    paperVersion = "git-Camellia-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page // Shiroha - Rebrand to Shiroha
++                    paperVersion = "git-Shiroha-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Folia - we have our own bstats page // Shiroha - Rebrand to Shiroha
                  } else {
                      paperVersion = "unknown";
                  }
 -                metrics.addCustomChart(new Metrics.SimplePie("folia_version", () -> paperVersion)); // Folia - we have our own bstats page
-+                metrics.addCustomChart(new Metrics.SimplePie("camellia_version", () -> paperVersion)); // Folia - we have our own bstats page // Shiroha - Rebrand to Shiroha
++                metrics.addCustomChart(new Metrics.SimplePie("shiroha_version", () -> paperVersion)); // Folia - we have our own bstats page // Shiroha - Rebrand to Shiroha
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
@@ -41,8 +41,8 @@ index 30815c8970b1f1c88a3c7bb5fd36efd915f1687d..05f159bb5a8499f8957367ed11a9f110
      private static final int DISTANCE_UNKNOWN = -2;
 -    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/folia"; // Folia
 -    private static final String REPOSITORY = "PaperMC/Folia"; // Folia
-+    private static final String DOWNLOAD_PAGE = "https://github.com/MonnaiRealms/Camellia"; // Folia // Shiroha - Rebrand to Shiroha
-+    private static final String REPOSITORY = "MonnaiRealms/Camellia"; // Folia // Shiroha - Rebrand to Shiroha
++    private static final String DOWNLOAD_PAGE = "https://github.com/Nanachiyo0721/Shiroha"; // Folia // Shiroha - Rebrand to Shiroha
++    private static final String REPOSITORY = "Nanachiyo0721/Shiroha"; // Folia // Shiroha - Rebrand to Shiroha
      private static final ServerBuildInfo BUILD_INFO = ServerBuildInfo.buildInfo();
      private static final String USER_AGENT = BUILD_INFO.brandName() + "/" + BUILD_INFO.asString(VERSION_SIMPLE) + " (https://papermc.io)";
      private static final Gson GSON = new Gson();
@@ -72,7 +72,7 @@ index 10a0be7a4db1a51579d113d279af7a9effe7f438..45cf7c5c9a4de2c7422e4d9c27fa0064
      private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
  
      private static final String BRAND_PAPER_NAME = "Paper";
-+    private static final String BRAND_CAMELLIA_NAME = "Camellia"; // Shiroha - Rebrand to Shiroha
++    private static final String BRAND_CAMELLIA_NAME = "Shiroha"; // Shiroha - Rebrand to Shiroha
  
      private static final String BUILD_DEV = "DEV";
  
@@ -106,10 +106,10 @@ index 5607f4cc8ca2f620461eb5e97d01d9db0d6b2303..5a86fa68007bc00fcf3ceda2d2492322
                      logger.log(Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once");
                      logger.log(Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes");
 -                    logger.log(Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues");
-+                    logger.log(Level.SEVERE, "If you are unsure or still think this is a Camellia bug, please report this to https://github.com/MonnaiRealms/Camellia/issues"); // Shiroha - Rebrand to Shiroha
++                    logger.log(Level.SEVERE, "If you are unsure or still think this is a Shiroha bug, please report this to https://github.com/Nanachiyo0721/Shiroha/issues"); // Shiroha - Rebrand to Shiroha
                      logger.log(Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports");
 -                    logger.log(Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion());
-+                    logger.log(Level.SEVERE, "Camellia version: " + Bukkit.getServer().getVersion()); // Shiroha - Rebrand to Shiroha
++                    logger.log(Level.SEVERE, "Shiroha version: " + Bukkit.getServer().getVersion()); // Shiroha - Rebrand to Shiroha
  
                      if (net.minecraft.world.level.Level.lastPhysicsProblem != null) {
                          logger.log(Level.SEVERE, "------------------------------");