diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 40eafd8..b52b52a 100644 --- a/.github/workflows/build-pr.yml +++ b/.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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e691ef..cfeae1e 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/build.gradle.kts b/build.gradle.kts index 540bbde..914896a 100644 --- a/build.gradle.kts +++ b/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") } } diff --git a/gradle.properties b/gradle.properties index 2ffbf74..d902a20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -group=moe.monnairealms.camellia +group=io.nanachiyo0721.shiroha mcVersion=26.2 apiVersion=26.2 channel=STABLE diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh index b87ddcc..388cb8b 100644 --- a/scripts/SetENV.sh +++ b/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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 168f051..5c37449 100644 --- a/settings.gradle.kts +++ b/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 } \ No newline at end of file diff --git a/camellia-api/build.gradle.kts.patch b/shiroha-api/build.gradle.kts.patch similarity index 100% rename from camellia-api/build.gradle.kts.patch rename to shiroha-api/build.gradle.kts.patch diff --git a/camellia-api/paper-patches/features/0001-Rebrand-to-Camellia.patch b/shiroha-api/paper-patches/features/0001-Rebrand-to-Shiroha.patch similarity index 93% rename from camellia-api/paper-patches/features/0001-Rebrand-to-Camellia.patch rename to shiroha-api/paper-patches/features/0001-Rebrand-to-Shiroha.patch index ff42187..51fb730 100644 --- a/camellia-api/paper-patches/features/0001-Rebrand-to-Camellia.patch +++ b/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 + /** diff --git a/camellia-api/paper-patches/features/0002-Disable-timings-warn-msg-and-commands.patch b/shiroha-api/paper-patches/features/0002-Disable-timings-warn-msg-and-commands.patch similarity index 100% rename from camellia-api/paper-patches/features/0002-Disable-timings-warn-msg-and-commands.patch rename to shiroha-api/paper-patches/features/0002-Disable-timings-warn-msg-and-commands.patch diff --git a/camellia-api/paper-patches/features/0003-Force-disable-reload-command-and-api.patch b/shiroha-api/paper-patches/features/0003-Force-disable-reload-command-and-api.patch similarity index 100% rename from camellia-api/paper-patches/features/0003-Force-disable-reload-command-and-api.patch rename to shiroha-api/paper-patches/features/0003-Force-disable-reload-command-and-api.patch diff --git a/camellia-api/paper-patches/features/0004-KioCG-Chunk-API.patch b/shiroha-api/paper-patches/features/0004-KioCG-Chunk-API.patch similarity index 100% rename from camellia-api/paper-patches/features/0004-KioCG-Chunk-API.patch rename to shiroha-api/paper-patches/features/0004-KioCG-Chunk-API.patch diff --git a/camellia-api/paper-patches/features/0005-Pufferfish-SIMD-Utilities.patch b/shiroha-api/paper-patches/features/0005-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from camellia-api/paper-patches/features/0005-Pufferfish-SIMD-Utilities.patch rename to shiroha-api/paper-patches/features/0005-Pufferfish-SIMD-Utilities.patch diff --git a/camellia-api/paper-patches/features/0006-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-api/paper-patches/features/0006-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from camellia-api/paper-patches/features/0006-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-api/paper-patches/features/0006-Purpur-Lobotomize-stuck-villagers.patch diff --git a/camellia-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/shiroha-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java similarity index 100% rename from camellia-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java rename to shiroha-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java diff --git a/camellia-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/shiroha-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java similarity index 100% rename from camellia-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java rename to shiroha-api/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java diff --git a/camellia-api/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/shiroha-api/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java similarity index 100% rename from camellia-api/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java rename to shiroha-api/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java diff --git a/camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ConfigDataPair.java b/shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ConfigDataPair.java similarity index 100% rename from camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ConfigDataPair.java rename to shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ConfigDataPair.java diff --git a/camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/CamelliaConfigBuilder.java b/shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ShirohaConfigBuilder.java similarity index 85% rename from camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/CamelliaConfigBuilder.java rename to shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ShirohaConfigBuilder.java index c7ee785..75bf604 100644 --- a/camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/CamelliaConfigBuilder.java +++ b/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. *

* 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, diff --git a/camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/CamelliaConfigsInstance.java b/shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ShirohaConfigsInstance.java similarity index 99% rename from camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/CamelliaConfigsInstance.java rename to shiroha-api/src/main/java/io/nanachiyo0721/shiroha/api/config/ShirohaConfigsInstance.java index 091b7f7..7803592 100644 --- a/camellia-api/src/main/java/io/nanachiyo0721/shiroha/api/config/CamelliaConfigsInstance.java +++ b/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 diff --git a/camellia-server/build.gradle.kts.patch b/shiroha-server/build.gradle.kts.patch similarity index 86% rename from camellia-server/build.gradle.kts.patch rename to shiroha-server/build.gradle.kts.patch index fb6a19d..ab02171 100644 --- a/camellia-server/build.gradle.kts.patch +++ b/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) diff --git a/camellia-server/minecraft-patches/features/0001-Config-system-framework.patch b/shiroha-server/minecraft-patches/features/0001-Config-system-framework.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0001-Config-system-framework.patch rename to shiroha-server/minecraft-patches/features/0001-Config-system-framework.patch diff --git a/camellia-server/minecraft-patches/features/0002-Configurable-region-format-framework.patch b/shiroha-server/minecraft-patches/features/0002-Configurable-region-format-framework.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0002-Configurable-region-format-framework.patch rename to shiroha-server/minecraft-patches/features/0002-Configurable-region-format-framework.patch diff --git a/camellia-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch b/shiroha-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch rename to shiroha-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch diff --git a/camellia-server/minecraft-patches/features/0004-Correct-CAS-get-in-RegionizedTaskQueue.patch b/shiroha-server/minecraft-patches/features/0004-Correct-CAS-get-in-RegionizedTaskQueue.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0004-Correct-CAS-get-in-RegionizedTaskQueue.patch rename to shiroha-server/minecraft-patches/features/0004-Correct-CAS-get-in-RegionizedTaskQueue.patch diff --git a/camellia-server/minecraft-patches/features/0005-Correct-thread-unsafe-random-sources.patch b/shiroha-server/minecraft-patches/features/0005-Correct-thread-unsafe-random-sources.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0005-Correct-thread-unsafe-random-sources.patch rename to shiroha-server/minecraft-patches/features/0005-Correct-thread-unsafe-random-sources.patch diff --git a/camellia-server/minecraft-patches/features/0006-Correct-portal-logic-of-some-projectile-entities-Sho.patch b/shiroha-server/minecraft-patches/features/0006-Correct-portal-logic-of-some-projectile-entities-Sho.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0006-Correct-portal-logic-of-some-projectile-entities-Sho.patch rename to shiroha-server/minecraft-patches/features/0006-Correct-portal-logic-of-some-projectile-entities-Sho.patch diff --git a/camellia-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch b/shiroha-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch rename to shiroha-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch diff --git a/camellia-server/minecraft-patches/features/0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch b/shiroha-server/minecraft-patches/features/0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch rename to shiroha-server/minecraft-patches/features/0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch diff --git a/camellia-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch b/shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch rename to shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch diff --git a/camellia-server/minecraft-patches/features/0010-Fix-region-threading-with-entity-ai-data-access.patch b/shiroha-server/minecraft-patches/features/0010-Fix-region-threading-with-entity-ai-data-access.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0010-Fix-region-threading-with-entity-ai-data-access.patch rename to shiroha-server/minecraft-patches/features/0010-Fix-region-threading-with-entity-ai-data-access.patch diff --git a/camellia-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch b/shiroha-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch rename to shiroha-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch diff --git a/camellia-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch b/shiroha-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch rename to shiroha-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch diff --git a/camellia-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch b/shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch rename to shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch diff --git a/camellia-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch b/shiroha-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch rename to shiroha-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch diff --git a/camellia-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch b/shiroha-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch rename to shiroha-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch diff --git a/camellia-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch b/shiroha-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch rename to shiroha-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch diff --git a/camellia-server/minecraft-patches/features/0017-Fix-creative-item-picking.patch b/shiroha-server/minecraft-patches/features/0017-Fix-creative-item-picking.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0017-Fix-creative-item-picking.patch rename to shiroha-server/minecraft-patches/features/0017-Fix-creative-item-picking.patch diff --git a/camellia-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch b/shiroha-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch rename to shiroha-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch diff --git a/camellia-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch b/shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch rename to shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch diff --git a/camellia-server/minecraft-patches/features/0020-Force-clamp-grid-exponent-to-1-6.patch b/shiroha-server/minecraft-patches/features/0020-Force-clamp-grid-exponent-to-1-6.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0020-Force-clamp-grid-exponent-to-1-6.patch rename to shiroha-server/minecraft-patches/features/0020-Force-clamp-grid-exponent-to-1-6.patch diff --git a/camellia-server/minecraft-patches/features/0021-Force-disable-builtin-spark-plugin.patch b/shiroha-server/minecraft-patches/features/0021-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0021-Force-disable-builtin-spark-plugin.patch rename to shiroha-server/minecraft-patches/features/0021-Force-disable-builtin-spark-plugin.patch diff --git a/camellia-server/minecraft-patches/features/0022-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch b/shiroha-server/minecraft-patches/features/0022-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0022-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch rename to shiroha-server/minecraft-patches/features/0022-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch diff --git a/camellia-server/minecraft-patches/features/0023-Replace-packet-processing-queue-with-mt-queue.patch b/shiroha-server/minecraft-patches/features/0023-Replace-packet-processing-queue-with-mt-queue.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0023-Replace-packet-processing-queue-with-mt-queue.patch rename to shiroha-server/minecraft-patches/features/0023-Replace-packet-processing-queue-with-mt-queue.patch diff --git a/camellia-server/minecraft-patches/features/0024-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0024-Async-protocol-switching-optimization.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0024-Async-protocol-switching-optimization.patch rename to shiroha-server/minecraft-patches/features/0024-Async-protocol-switching-optimization.patch diff --git a/camellia-server/minecraft-patches/features/0025-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0025-Improved-server-health-command.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0025-Improved-server-health-command.patch rename to shiroha-server/minecraft-patches/features/0025-Improved-server-health-command.patch diff --git a/camellia-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch rename to shiroha-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/camellia-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch rename to shiroha-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/camellia-server/minecraft-patches/features/0028-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0028-Add-config-to-support-for-long-command-inputs.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0028-Add-config-to-support-for-long-command-inputs.patch rename to shiroha-server/minecraft-patches/features/0028-Add-config-to-support-for-long-command-inputs.patch diff --git a/camellia-server/minecraft-patches/features/0029-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0029-Add-config-for-server-mod-name.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0029-Add-config-for-server-mod-name.patch rename to shiroha-server/minecraft-patches/features/0029-Add-config-for-server-mod-name.patch diff --git a/camellia-server/minecraft-patches/features/0030-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0030-Add-config-for-cpu-affinity.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0030-Add-config-for-cpu-affinity.patch rename to shiroha-server/minecraft-patches/features/0030-Add-config-for-cpu-affinity.patch diff --git a/camellia-server/minecraft-patches/features/0031-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0031-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0031-Add-config-for-unsafe-teleportation.patch rename to shiroha-server/minecraft-patches/features/0031-Add-config-for-unsafe-teleportation.patch diff --git a/camellia-server/minecraft-patches/features/0032-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0032-Add-config-for-watchdog-timeout.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0032-Add-config-for-watchdog-timeout.patch rename to shiroha-server/minecraft-patches/features/0032-Add-config-for-watchdog-timeout.patch diff --git a/camellia-server/minecraft-patches/features/0033-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0033-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0033-Add-config-to-disable-entity-tick-catchers.patch rename to shiroha-server/minecraft-patches/features/0033-Add-config-to-disable-entity-tick-catchers.patch diff --git a/camellia-server/minecraft-patches/features/0034-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0034-Add-config-for-heightmap-warning.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0034-Add-config-for-heightmap-warning.patch rename to shiroha-server/minecraft-patches/features/0034-Add-config-for-heightmap-warning.patch diff --git a/camellia-server/minecraft-patches/features/0035-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0035-Add-config-gui-support.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0035-Add-config-gui-support.patch rename to shiroha-server/minecraft-patches/features/0035-Add-config-gui-support.patch diff --git a/camellia-server/minecraft-patches/features/0036-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0036-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0036-Add-force-the-data-command-to-be-enabled-config.patch rename to shiroha-server/minecraft-patches/features/0036-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/camellia-server/minecraft-patches/features/0037-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0037-Add-experimental-config-for-command-block-command-ex.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0037-Add-experimental-config-for-command-block-command-ex.patch rename to shiroha-server/minecraft-patches/features/0037-Add-experimental-config-for-command-block-command-ex.patch diff --git a/camellia-server/minecraft-patches/features/0038-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0038-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0038-Add-config-to-modify-tripwire-behavior.patch rename to shiroha-server/minecraft-patches/features/0038-Add-config-to-modify-tripwire-behavior.patch diff --git a/camellia-server/minecraft-patches/features/0039-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0039-Add-config-for-item-multitask.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0039-Add-config-for-item-multitask.patch rename to shiroha-server/minecraft-patches/features/0039-Add-config-for-item-multitask.patch diff --git a/camellia-server/minecraft-patches/features/0040-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0040-Add-config-to-enable-tick-command.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0040-Add-config-to-enable-tick-command.patch rename to shiroha-server/minecraft-patches/features/0040-Add-config-to-enable-tick-command.patch diff --git a/camellia-server/minecraft-patches/features/0041-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0041-Add-config-for-whether-to-save-portal-tickets.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0041-Add-config-for-whether-to-save-portal-tickets.patch rename to shiroha-server/minecraft-patches/features/0041-Add-config-for-whether-to-save-portal-tickets.patch diff --git a/camellia-server/minecraft-patches/features/0042-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0042-Add-portal-rate-limiter.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0042-Add-portal-rate-limiter.patch rename to shiroha-server/minecraft-patches/features/0042-Add-portal-rate-limiter.patch diff --git a/camellia-server/minecraft-patches/features/0043-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0043-Add-status-bar.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0043-Add-status-bar.patch rename to shiroha-server/minecraft-patches/features/0043-Add-status-bar.patch diff --git a/camellia-server/minecraft-patches/features/0044-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0044-Leaves-Vanilla-Hopper.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0044-Leaves-Vanilla-Hopper.patch rename to shiroha-server/minecraft-patches/features/0044-Leaves-Vanilla-Hopper.patch diff --git a/camellia-server/minecraft-patches/features/0045-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0045-Leaves-Lithium-Sleeping-Block-Entity.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0045-Leaves-Lithium-Sleeping-Block-Entity.patch rename to shiroha-server/minecraft-patches/features/0045-Leaves-Lithium-Sleeping-Block-Entity.patch diff --git a/camellia-server/minecraft-patches/features/0046-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0046-Petal-Reduce-sensor-work.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0046-Petal-Reduce-sensor-work.patch rename to shiroha-server/minecraft-patches/features/0046-Petal-Reduce-sensor-work.patch diff --git a/camellia-server/minecraft-patches/features/0047-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0047-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0047-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-server/minecraft-patches/features/0047-Purpur-Lobotomize-stuck-villagers.patch diff --git a/camellia-server/minecraft-patches/features/0048-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0048-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0048-Pufferfish-Reduce-projectile-chunk-loading.patch rename to shiroha-server/minecraft-patches/features/0048-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/camellia-server/minecraft-patches/features/0049-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0049-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0049-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to shiroha-server/minecraft-patches/features/0049-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/camellia-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch rename to shiroha-server/minecraft-patches/features/0050-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/camellia-server/minecraft-patches/features/0051-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0051-Secure-seed-V2-with-Blake3.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0051-Secure-seed-V2-with-Blake3.patch rename to shiroha-server/minecraft-patches/features/0051-Secure-seed-V2-with-Blake3.patch diff --git a/camellia-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0052-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/camellia-server/minecraft-patches/features/0053-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0053-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0053-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to shiroha-server/minecraft-patches/features/0053-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/camellia-server/minecraft-patches/features/0054-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0054-Leaf-Optimize-PatchedDataComponentMap-equals.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0054-Leaf-Optimize-PatchedDataComponentMap-equals.patch rename to shiroha-server/minecraft-patches/features/0054-Leaf-Optimize-PatchedDataComponentMap-equals.patch diff --git a/camellia-server/minecraft-patches/features/0055-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0055-Leaf-Better-checking-for-useless-move-packets.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0055-Leaf-Better-checking-for-useless-move-packets.patch rename to shiroha-server/minecraft-patches/features/0055-Leaf-Better-checking-for-useless-move-packets.patch diff --git a/camellia-server/minecraft-patches/features/0056-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0056-Leaf-fast-bit-radix-sort.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0056-Leaf-fast-bit-radix-sort.patch rename to shiroha-server/minecraft-patches/features/0056-Leaf-fast-bit-radix-sort.patch diff --git a/camellia-server/minecraft-patches/features/0057-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0057-Leaf-Configurable-vanilla-username-check.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0057-Leaf-Configurable-vanilla-username-check.patch rename to shiroha-server/minecraft-patches/features/0057-Leaf-Configurable-vanilla-username-check.patch diff --git a/camellia-server/minecraft-patches/features/0058-Leaves-Disable-packet-limit-Camellia-Option-to-full-.patch b/shiroha-server/minecraft-patches/features/0058-Leaves-Disable-packet-limit-Shiroha-Option-to-full-.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0058-Leaves-Disable-packet-limit-Camellia-Option-to-full-.patch rename to shiroha-server/minecraft-patches/features/0058-Leaves-Disable-packet-limit-Shiroha-Option-to-full-.patch diff --git a/camellia-server/minecraft-patches/features/0059-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0059-Leaves-Configurable-collision-behavior.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0059-Leaves-Configurable-collision-behavior.patch rename to shiroha-server/minecraft-patches/features/0059-Leaves-Configurable-collision-behavior.patch diff --git a/camellia-server/minecraft-patches/features/0060-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0060-Leaves-Optimized-dragon-respawn.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0060-Leaves-Optimized-dragon-respawn.patch rename to shiroha-server/minecraft-patches/features/0060-Leaves-Optimized-dragon-respawn.patch diff --git a/camellia-server/minecraft-patches/features/0061-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0061-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0061-Gale-Variable-entity-wake-up-duration.patch rename to shiroha-server/minecraft-patches/features/0061-Gale-Variable-entity-wake-up-duration.patch diff --git a/camellia-server/minecraft-patches/features/0062-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0062-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0062-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0062-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/camellia-server/minecraft-patches/features/0063-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0063-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0063-Gale-Skip-entity-move-if-movement-is-zero.patch rename to shiroha-server/minecraft-patches/features/0063-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/camellia-server/minecraft-patches/features/0064-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0064-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0064-Gale-Store-mob-counts-in-an-array.patch rename to shiroha-server/minecraft-patches/features/0064-Gale-Store-mob-counts-in-an-array.patch diff --git a/camellia-server/minecraft-patches/features/0065-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0065-Gale-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0065-Gale-Optimize-random-calls-in-chunk-ticking.patch rename to shiroha-server/minecraft-patches/features/0065-Gale-Optimize-random-calls-in-chunk-ticking.patch diff --git a/camellia-server/minecraft-patches/features/0066-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0066-Gale-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0066-Gale-Reduce-enderman-teleport-chunk-lookups.patch rename to shiroha-server/minecraft-patches/features/0066-Gale-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/camellia-server/minecraft-patches/features/0067-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0067-Gale-Cache-ShapePairKey-hash.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0067-Gale-Cache-ShapePairKey-hash.patch rename to shiroha-server/minecraft-patches/features/0067-Gale-Cache-ShapePairKey-hash.patch diff --git a/camellia-server/minecraft-patches/features/0068-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0068-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0068-Gale-For-collision-check-has-physics-before-same-veh.patch rename to shiroha-server/minecraft-patches/features/0068-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/camellia-server/minecraft-patches/features/0069-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0069-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0069-Gale-Skip-negligible-planar-movement-multiplication.patch rename to shiroha-server/minecraft-patches/features/0069-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/camellia-server/minecraft-patches/features/0070-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0070-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0070-Gale-Optimize-matching-item-checks.patch rename to shiroha-server/minecraft-patches/features/0070-Gale-Optimize-matching-item-checks.patch diff --git a/camellia-server/minecraft-patches/features/0071-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0071-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0071-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to shiroha-server/minecraft-patches/features/0071-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/camellia-server/minecraft-patches/features/0072-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0072-Gale-Reduce-array-allocations.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0072-Gale-Reduce-array-allocations.patch rename to shiroha-server/minecraft-patches/features/0072-Gale-Reduce-array-allocations.patch diff --git a/camellia-server/minecraft-patches/features/0073-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0073-Some-optimizations-from-krypton.patch similarity index 100% rename from camellia-server/minecraft-patches/features/0073-Some-optimizations-from-krypton.patch rename to shiroha-server/minecraft-patches/features/0073-Some-optimizations-from-krypton.patch diff --git a/camellia-server/paper-patches/features/0001-Rebrand-to-Camellia.patch b/shiroha-server/paper-patches/features/0001-Rebrand-to-Shiroha.patch similarity index 87% rename from camellia-server/paper-patches/features/0001-Rebrand-to-Camellia.patch rename to shiroha-server/paper-patches/features/0001-Rebrand-to-Shiroha.patch index ea6903f..be1fed4 100644 --- a/camellia-server/paper-patches/features/0001-Rebrand-to-Camellia.patch +++ b/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> 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, "------------------------------"); diff --git a/camellia-server/paper-patches/features/0002-Correct-thread-unsafe-random-sources.patch b/shiroha-server/paper-patches/features/0002-Correct-thread-unsafe-random-sources.patch similarity index 100% rename from camellia-server/paper-patches/features/0002-Correct-thread-unsafe-random-sources.patch rename to shiroha-server/paper-patches/features/0002-Correct-thread-unsafe-random-sources.patch diff --git a/camellia-server/paper-patches/features/0003-Force-disable-reload-command-and-api.patch b/shiroha-server/paper-patches/features/0003-Force-disable-reload-command-and-api.patch similarity index 100% rename from camellia-server/paper-patches/features/0003-Force-disable-reload-command-and-api.patch rename to shiroha-server/paper-patches/features/0003-Force-disable-reload-command-and-api.patch diff --git a/camellia-server/paper-patches/features/0004-Force-disable-builtin-spark-plugin.patch b/shiroha-server/paper-patches/features/0004-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from camellia-server/paper-patches/features/0004-Force-disable-builtin-spark-plugin.patch rename to shiroha-server/paper-patches/features/0004-Force-disable-builtin-spark-plugin.patch diff --git a/camellia-server/paper-patches/features/0005-Add-config-for-server-mod-name.patch b/shiroha-server/paper-patches/features/0005-Add-config-for-server-mod-name.patch similarity index 100% rename from camellia-server/paper-patches/features/0005-Add-config-for-server-mod-name.patch rename to shiroha-server/paper-patches/features/0005-Add-config-for-server-mod-name.patch diff --git a/camellia-server/paper-patches/features/0006-Add-config-to-disable-async-catchers.patch b/shiroha-server/paper-patches/features/0006-Add-config-to-disable-async-catchers.patch similarity index 100% rename from camellia-server/paper-patches/features/0006-Add-config-to-disable-async-catchers.patch rename to shiroha-server/paper-patches/features/0006-Add-config-to-disable-async-catchers.patch diff --git a/camellia-server/paper-patches/features/0007-Add-config-to-avoid-of-folia-supported-check.patch b/shiroha-server/paper-patches/features/0007-Add-config-to-avoid-of-folia-supported-check.patch similarity index 100% rename from camellia-server/paper-patches/features/0007-Add-config-to-avoid-of-folia-supported-check.patch rename to shiroha-server/paper-patches/features/0007-Add-config-to-avoid-of-folia-supported-check.patch diff --git a/camellia-server/paper-patches/features/0008-Add-config-for-cpu-affinity.patch b/shiroha-server/paper-patches/features/0008-Add-config-for-cpu-affinity.patch similarity index 100% rename from camellia-server/paper-patches/features/0008-Add-config-for-cpu-affinity.patch rename to shiroha-server/paper-patches/features/0008-Add-config-for-cpu-affinity.patch diff --git a/camellia-server/paper-patches/features/0009-Add-status-bar.patch b/shiroha-server/paper-patches/features/0009-Add-status-bar.patch similarity index 100% rename from camellia-server/paper-patches/features/0009-Add-status-bar.patch rename to shiroha-server/paper-patches/features/0009-Add-status-bar.patch diff --git a/camellia-server/paper-patches/features/0010-Add-back-BlockPos-transform-to-Position-support.patch b/shiroha-server/paper-patches/features/0010-Add-back-BlockPos-transform-to-Position-support.patch similarity index 100% rename from camellia-server/paper-patches/features/0010-Add-back-BlockPos-transform-to-Position-support.patch rename to shiroha-server/paper-patches/features/0010-Add-back-BlockPos-transform-to-Position-support.patch diff --git a/camellia-server/paper-patches/features/0011-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/paper-patches/features/0011-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from camellia-server/paper-patches/features/0011-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-server/paper-patches/features/0011-Purpur-Lobotomize-stuck-villagers.patch diff --git a/camellia-server/paper-patches/features/0012-Leaf-Skip-event-if-no-listeners.patch b/shiroha-server/paper-patches/features/0012-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from camellia-server/paper-patches/features/0012-Leaf-Skip-event-if-no-listeners.patch rename to shiroha-server/paper-patches/features/0012-Leaf-Skip-event-if-no-listeners.patch diff --git a/camellia-server/paper-patches/features/0013-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/paper-patches/features/0013-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from camellia-server/paper-patches/features/0013-Leaf-Secure-seed-and-matter-seed-command.patch rename to shiroha-server/paper-patches/features/0013-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/camellia-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch similarity index 100% rename from camellia-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch rename to shiroha-server/paper-patches/features/0014-Leaf-Configurable-vanilla-username-check.patch diff --git a/camellia-server/src/main/java/abomination/LinearRegionFile.java b/shiroha-server/src/main/java/abomination/LinearRegionFile.java similarity index 100% rename from camellia-server/src/main/java/abomination/LinearRegionFile.java rename to shiroha-server/src/main/java/abomination/LinearRegionFile.java diff --git a/camellia-server/src/main/java/com/kiocg/ChunkHot.java b/shiroha-server/src/main/java/com/kiocg/ChunkHot.java similarity index 100% rename from camellia-server/src/main/java/com/kiocg/ChunkHot.java rename to shiroha-server/src/main/java/com/kiocg/ChunkHot.java diff --git a/camellia-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java b/shiroha-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java similarity index 100% rename from camellia-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java rename to shiroha-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java diff --git a/camellia-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java b/shiroha-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java similarity index 100% rename from camellia-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java rename to shiroha-server/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/CommandRegister.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/CommandRegister.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/CommandRegister.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/CommandRegister.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarSubcommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarSubcommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarSubcommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/BarSubcommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ConfigEditCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ConfigEditCommand.java similarity index 94% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ConfigEditCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ConfigEditCommand.java index 29071a2..473507e 100644 --- a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ConfigEditCommand.java +++ b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ConfigEditCommand.java @@ -1,7 +1,7 @@ package io.nanachiyo0721.shiroha.commands.bar.sub; import com.mojang.brigadier.arguments.BoolArgumentType; -import io.nanachiyo0721.shiroha.api.config.CamelliaConfigsInstance; +import io.nanachiyo0721.shiroha.api.config.ShirohaConfigsInstance; import io.nanachiyo0721.shiroha.config.ConfigManager; import io.nanachiyo0721.shiroha.config.modules.function.MembarConfig; import io.nanachiyo0721.shiroha.config.modules.function.RegionBarConfig; @@ -54,7 +54,7 @@ public class ConfigEditCommand extends LiteralNode { .text("Bar type with " + barType.getName() + " was already " + (value ? "enabled" : "disabled") + "!") .color(TextColor.color(255, 0, 0))); } else { - CamelliaConfigsInstance config = ConfigManager.getConfigs(barType.getConfigOrigin()); + ShirohaConfigsInstance config = ConfigManager.getConfigs(barType.getConfigOrigin()); if (config.setConfig(barType.getConfigPath(), value)) { context.getSender().sendMessage( diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ToggleCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ToggleCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ToggleCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/bar/sub/ToggleCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigSubcommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigSubcommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigSubcommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/ConfigSubcommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/CleanCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/CleanCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/CleanCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/CleanCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/OpenGuiCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/OpenGuiCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/OpenGuiCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/OpenGuiCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ReloadCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ReloadCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ReloadCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ReloadCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommentsCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommentsCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommentsCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/ResetCommentsCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SetCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SetCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SetCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SetCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SubmitCommand.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SubmitCommand.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SubmitCommand.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/commands/config/sub/SubmitCommand.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigManager.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigManager.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigManager.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigManager.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstance.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstance.java similarity index 99% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstance.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstance.java index 4a727f8..50772d3 100644 --- a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstance.java +++ b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstance.java @@ -5,7 +5,7 @@ import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.mojang.logging.LogUtils; import io.nanachiyo0721.shiroha.config.flags.*; import io.papermc.paper.threadedregions.RegionizedServer; -import io.nanachiyo0721.shiroha.api.config.CamelliaConfigsInstance; +import io.nanachiyo0721.shiroha.api.config.ShirohaConfigsInstance; import io.nanachiyo0721.shiroha.api.config.ConfigDataPair; import io.nanachiyo0721.shiroha.commands.config.ConfigCommand; import io.nanachiyo0721.shiroha.enums.EnumConfigCategory; @@ -26,7 +26,7 @@ import java.util.stream.Collectors; /** * Configuration instance manager that handles loading, reloading and managing configuration modules. */ -public class ConfigsInstance implements CamelliaConfigsInstance { +public class ConfigsInstance implements ShirohaConfigsInstance { public final Logger logger = LogUtils.getClassLogger(); // Basic configuration properties diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstanceBuilder.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstanceBuilder.java similarity index 94% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstanceBuilder.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstanceBuilder.java index 4f65c4b..a66aaf4 100644 --- a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstanceBuilder.java +++ b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/ConfigsInstanceBuilder.java @@ -1,12 +1,12 @@ package io.nanachiyo0721.shiroha.config; -import io.nanachiyo0721.shiroha.api.config.CamelliaConfigBuilder; +import io.nanachiyo0721.shiroha.api.config.ShirohaConfigBuilder; import net.minecraft.server.MinecraftServer; import org.jetbrains.annotations.NotNull; import java.io.File; -public class ConfigsInstanceBuilder implements CamelliaConfigBuilder { +public class ConfigsInstanceBuilder implements ShirohaConfigBuilder { // Factory methods for creating ConfigsInstance objects public ConfigsInstance of( @NotNull ClassLoader loader, diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/DefaultTransformLogic.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/DefaultTransformLogic.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/DefaultTransformLogic.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/DefaultTransformLogic.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/IConfigModule.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/IConfigModule.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/IConfigModule.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/IConfigModule.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/IllegalFormatConversionExceptionWithOrigin.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/IllegalFormatConversionExceptionWithOrigin.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/IllegalFormatConversionExceptionWithOrigin.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/IllegalFormatConversionExceptionWithOrigin.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/CommandSuggestions.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/CommandSuggestions.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/CommandSuggestions.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/CommandSuggestions.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigClassInfo.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigClassInfo.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigClassInfo.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigClassInfo.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigInfo.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigInfo.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigInfo.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/ConfigInfo.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/DoNotLoad.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/DoNotLoad.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/DoNotLoad.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/DoNotLoad.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/HotReloadUnsupported.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/HotReloadUnsupported.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/HotReloadUnsupported.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/HotReloadUnsupported.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/TransformedConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/TransformedConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/TransformedConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/flags/TransformedConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/CommandConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/CommandConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/CommandConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/CommandConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableAsyncCatcherConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableAsyncCatcherConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableAsyncCatcherConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableAsyncCatcherConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableEntityCatchConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableEntityCatchConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableEntityCatchConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/experiment/DisableEntityCatchConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/CollisionBehaviorConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/CollisionBehaviorConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/CollisionBehaviorConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/CollisionBehaviorConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/FoliaEntityMovingFixConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/FoliaEntityMovingFixConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/FoliaEntityMovingFixConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/FoliaEntityMovingFixConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ForceCleanupEntityBrainMemoryConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ForceCleanupEntityBrainMemoryConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ForceCleanupEntityBrainMemoryConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ForceCleanupEntityBrainMemoryConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ItemMultitaskConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ItemMultitaskConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ItemMultitaskConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/ItemMultitaskConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/LongCommandSupportConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/LongCommandSupportConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/LongCommandSupportConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/LongCommandSupportConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/POIRangeFixes.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/POIRangeFixes.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/POIRangeFixes.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/POIRangeFixes.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/PathfindingFixesConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/PathfindingFixesConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/PathfindingFixesConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/PathfindingFixesConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/UnsafeTeleportationConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/UnsafeTeleportationConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/UnsafeTeleportationConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/fixes/UnsafeTeleportationConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/MembarConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/MembarConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/MembarConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/MembarConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/PortalRateLimiterConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/PortalRateLimiterConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/PortalRateLimiterConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/PortalRateLimiterConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionBarConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionBarConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionBarConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionBarConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionFormatConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionFormatConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionFormatConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/RegionFormatConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/SecureSeedConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/SecureSeedConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/SecureSeedConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/SecureSeedConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TpsBarConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TpsBarConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TpsBarConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TpsBarConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TripwireBehaviorConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TripwireBehaviorConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TripwireBehaviorConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/function/TripwireBehaviorConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/DisableWarningConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/DisableWarningConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/DisableWarningConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/DisableWarningConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/FoliaWatchogConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/FoliaWatchogConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/FoliaWatchogConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/FoliaWatchogConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/PaperPacketLimiterConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/PaperPacketLimiterConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/PaperPacketLimiterConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/PaperPacketLimiterConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/SavePortalTicketsConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/SavePortalTicketsConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/SavePortalTicketsConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/SavePortalTicketsConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/ServerModNameConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/ServerModNameConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/ServerModNameConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/ServerModNameConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/UsernameCheckConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/UsernameCheckConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/UsernameCheckConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/misc/UsernameCheckConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/AsyncProtocolChangeConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/AsyncProtocolChangeConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/AsyncProtocolChangeConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/AsyncProtocolChangeConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/CpuAffinityConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/CpuAffinityConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/CpuAffinityConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/CpuAffinityConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/EntityGoalSelectorInactiveTickConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/EntityGoalSelectorInactiveTickConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/EntityGoalSelectorInactiveTickConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/EntityGoalSelectorInactiveTickConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/GaleVariableEntityWakeupConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/GaleVariableEntityWakeupConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/GaleVariableEntityWakeupConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/GaleVariableEntityWakeupConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/KaiijuEntityLimiterConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/KaiijuEntityLimiterConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/KaiijuEntityLimiterConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/KaiijuEntityLimiterConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LeavesSleepingBlockEntityConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LeavesSleepingBlockEntityConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LeavesSleepingBlockEntityConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LeavesSleepingBlockEntityConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LobotomizeVillageConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LobotomizeVillageConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LobotomizeVillageConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/LobotomizeVillageConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/OptimizedDragonRespawnConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/OptimizedDragonRespawnConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/OptimizedDragonRespawnConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/OptimizedDragonRespawnConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/PetalReduceSensorWorkConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/PetalReduceSensorWorkConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/PetalReduceSensorWorkConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/PetalReduceSensorWorkConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/ProjectileChunkReduceConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/ProjectileChunkReduceConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/ProjectileChunkReduceConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/ProjectileChunkReduceConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/SIMDConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/SIMDConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/SIMDConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/optimizations/SIMDConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/removed/RemovedConfig.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/removed/RemovedConfig.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/removed/RemovedConfig.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/removed/RemovedConfig.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/unsupported/DisableCheckForFoliaSupported.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/unsupported/DisableCheckForFoliaSupported.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/unsupported/DisableCheckForFoliaSupported.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/config/modules/unsupported/DisableCheckForFoliaSupported.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/data/BufferedLinearRegionFile.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/data/BufferedLinearRegionFile.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/data/BufferedLinearRegionFile.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/data/BufferedLinearRegionFile.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/data/RegionFile.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/data/RegionFile.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/data/RegionFile.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/data/RegionFile.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumBarType.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumBarType.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumBarType.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumBarType.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumCollisionBehaviorMode.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumCollisionBehaviorMode.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumCollisionBehaviorMode.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumCollisionBehaviorMode.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumConfigCategory.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumConfigCategory.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumConfigCategory.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumConfigCategory.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumRegionFormat.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumRegionFormat.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumRegionFormat.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumRegionFormat.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumStatusBarDisplay.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumStatusBarDisplay.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumStatusBarDisplay.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumStatusBarDisplay.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumTripwireBehavior.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumTripwireBehavior.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumTripwireBehavior.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/enums/EnumTripwireBehavior.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBar.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBar.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBar.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBar.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBarList.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBarList.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBarList.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/TickableStatusBarList.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/Membar.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/Membar.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/Membar.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/Membar.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/RegionBar.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/RegionBar.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/RegionBar.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/RegionBar.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/TpsBar.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/TpsBar.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/TpsBar.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/functions/bars/impl/TpsBar.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/AffinityRunnableWrapper.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/AffinityRunnableWrapper.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/AffinityRunnableWrapper.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/AffinityRunnableWrapper.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/BufferedLinearRegionFileFlusher.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/BufferedLinearRegionFileFlusher.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/BufferedLinearRegionFileFlusher.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/BufferedLinearRegionFileFlusher.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/ClassLoadUtil.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/ClassLoadUtil.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/ClassLoadUtil.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/ClassLoadUtil.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/NullPlugin.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/NullPlugin.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/NullPlugin.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/NullPlugin.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/RateThrottler.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/RateThrottler.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/RateThrottler.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/RateThrottler.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionCreatorInfo.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionCreatorInfo.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionCreatorInfo.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionCreatorInfo.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionFileFactory.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionFileFactory.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionFileFactory.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/RegionFileFactory.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigCommandDialog.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigCommandDialog.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigCommandDialog.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigCommandDialog.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigDialogUtil.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigDialogUtil.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigDialogUtil.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/ConfigDialogUtil.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/DialogUtil.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/DialogUtil.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/DialogUtil.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/dialog/DialogUtil.java diff --git a/camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/entity/EntityMoveOutOfRegionException.java b/shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/entity/EntityMoveOutOfRegionException.java similarity index 100% rename from camellia-server/src/main/java/io/nanachiyo0721/shiroha/utils/entity/EntityMoveOutOfRegionException.java rename to shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/entity/EntityMoveOutOfRegionException.java diff --git a/camellia-server/src/main/java/me/titaniumtown/ArrayConstants.java b/shiroha-server/src/main/java/me/titaniumtown/ArrayConstants.java similarity index 100% rename from camellia-server/src/main/java/me/titaniumtown/ArrayConstants.java rename to shiroha-server/src/main/java/me/titaniumtown/ArrayConstants.java diff --git a/camellia-server/src/main/java/org/dreeam/leaf/util/FastBitRadixSort.java b/shiroha-server/src/main/java/org/dreeam/leaf/util/FastBitRadixSort.java similarity index 100% rename from camellia-server/src/main/java/org/dreeam/leaf/util/FastBitRadixSort.java rename to shiroha-server/src/main/java/org/dreeam/leaf/util/FastBitRadixSort.java diff --git a/camellia-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java b/shiroha-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java similarity index 100% rename from camellia-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java rename to shiroha-server/src/main/java/org/dreeam/leaf/world/biome/PositionalBiomeGetter.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/ArgumentNode.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/ArgumentNode.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/ArgumentNode.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/ArgumentNode.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/CommandContext.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/CommandContext.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/CommandContext.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/CommandContext.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/CommandNode.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/CommandNode.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/CommandNode.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/CommandNode.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/CommandUtils.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/CommandUtils.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/CommandUtils.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/CommandUtils.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/LiteralNode.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/LiteralNode.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/LiteralNode.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/LiteralNode.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/RootNode.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/RootNode.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/RootNode.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/RootNode.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/command/WrappedArgument.java b/shiroha-server/src/main/java/org/leavesmc/leaves/command/WrappedArgument.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/command/WrappedArgument.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/command/WrappedArgument.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumCooldownReceivingInventory.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumCooldownReceivingInventory.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumCooldownReceivingInventory.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumCooldownReceivingInventory.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumDefaultedList.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumDefaultedList.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumDefaultedList.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumDefaultedList.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumInventory.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumInventory.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumInventory.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumInventory.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumTransferConditionInventory.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumTransferConditionInventory.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumTransferConditionInventory.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/api/inventory/LithiumTransferConditionInventory.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetBlockStateHandlingBlockEntity.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetBlockStateHandlingBlockEntity.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetBlockStateHandlingBlockEntity.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetBlockStateHandlingBlockEntity.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetChangedHandlingBlockEntity.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetChangedHandlingBlockEntity.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetChangedHandlingBlockEntity.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SetChangedHandlingBlockEntity.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/ShapeUpdateHandlingBlockBehaviour.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/ShapeUpdateHandlingBlockBehaviour.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/ShapeUpdateHandlingBlockBehaviour.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/ShapeUpdateHandlingBlockBehaviour.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepUntilTimeBlockEntityTickInvoker.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepUntilTimeBlockEntityTickInvoker.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepUntilTimeBlockEntityTickInvoker.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepUntilTimeBlockEntityTickInvoker.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepingBlockEntity.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepingBlockEntity.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepingBlockEntity.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/SleepingBlockEntity.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeEmitter.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeEmitter.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeEmitter.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeEmitter.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeListener.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeListener.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeListener.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeListener.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeTracker.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeTracker.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeTracker.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_change_tracking/InventoryChangeTracker.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracker.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracker.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracker.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracker.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracking.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracking.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracking.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/block/entity/inventory_comparator_tracking/ComparatorTracking.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/BlockStateOnlyInventory.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/BlockStateOnlyInventory.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/BlockStateOnlyInventory.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/BlockStateOnlyInventory.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/ComparatorUpdatePattern.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/ComparatorUpdatePattern.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/ComparatorUpdatePattern.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/ComparatorUpdatePattern.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperCachingState.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperCachingState.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperCachingState.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperCachingState.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperHelper.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperHelper.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperHelper.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/HopperHelper.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/InventoryHelper.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/InventoryHelper.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/InventoryHelper.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/InventoryHelper.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleInventory.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleInventory.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleInventory.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleInventory.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleStackList.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleStackList.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleStackList.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumDoubleStackList.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumStackList.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumStackList.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumStackList.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/LithiumStackList.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/UpdateReceiver.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/UpdateReceiver.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/UpdateReceiver.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/hopper/UpdateReceiver.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementListener.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementListener.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementListener.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementListener.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementTracker.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementTracker.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementTracker.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionEntityMovementTracker.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionInventoryEntityTracker.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionInventoryEntityTracker.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionInventoryEntityTracker.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionInventoryEntityTracker.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionItemEntityMovementTracker.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionItemEntityMovementTracker.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionItemEntityMovementTracker.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/tracking/entity/ChunkSectionItemEntityMovementTracker.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/DirectionConstants.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/DirectionConstants.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/DirectionConstants.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/DirectionConstants.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangePublisher.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangePublisher.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangePublisher.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangePublisher.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangeSubscriber.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangeSubscriber.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangeSubscriber.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/change_tracking/ChangeSubscriber.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/tuples/WorldSectionBox.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/tuples/WorldSectionBox.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/util/tuples/WorldSectionBox.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/util/tuples/WorldSectionBox.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/world/WorldHelper.java b/shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/world/WorldHelper.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/lithium/common/world/WorldHelper.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/lithium/common/world/WorldHelper.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java b/shiroha-server/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java diff --git a/camellia-server/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java b/shiroha-server/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java similarity index 100% rename from camellia-server/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java rename to shiroha-server/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java diff --git a/camellia-server/src/main/java/su/plo/matter/Globals.java b/shiroha-server/src/main/java/su/plo/matter/Globals.java similarity index 100% rename from camellia-server/src/main/java/su/plo/matter/Globals.java rename to shiroha-server/src/main/java/su/plo/matter/Globals.java diff --git a/camellia-server/src/main/java/su/plo/matter/Hashing.java b/shiroha-server/src/main/java/su/plo/matter/Hashing.java similarity index 100% rename from camellia-server/src/main/java/su/plo/matter/Hashing.java rename to shiroha-server/src/main/java/su/plo/matter/Hashing.java diff --git a/camellia-server/src/main/java/su/plo/matter/HashingV2.java b/shiroha-server/src/main/java/su/plo/matter/HashingV2.java similarity index 100% rename from camellia-server/src/main/java/su/plo/matter/HashingV2.java rename to shiroha-server/src/main/java/su/plo/matter/HashingV2.java diff --git a/camellia-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java b/shiroha-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java similarity index 100% rename from camellia-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java rename to shiroha-server/src/main/java/su/plo/matter/WorldgenCryptoRandom.java