From f7419384e94f81ee68c5cc894fd17a48af4afdf3 Mon Sep 17 00:00:00 2001 From: Riflusso Date: Sun, 28 Sep 2025 12:15:20 +0400 Subject: [PATCH 1/6] feat: Port to Modstitch --- .github/workflows/build.yml | 57 +++ .gitignore | 43 ++ README.md | 110 +++++ build.gradle.kts | 189 +++++++++ gradle.properties | 16 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++ gradlew.bat | 94 +++++ modstitch.accesswidener | 3 + settings.gradle.kts | 35 ++ .../accessor/FilePackResourcesAccessor.java | 9 + .../mixins/FilePackResourcesMixin.java | 58 +++ .../mixins/MinecraftClientMixin.java | 18 + .../mixins/PackRepositoryMixin.java | 61 +++ .../mixins/ResourcePackEntryMixin.java | 96 +++++ .../mixins/ResourcePackScreenMixin.java | 20 + .../dynamicpack/mixins/TitleScreenMixin.java | 25 ++ .../calculatorsteam/dynamicpack/Constants.kt | 163 ++++++++ .../dynamicpack/DynamicPackMod.kt | 130 ++++++ .../dynamicpack/InputValidator.kt | 109 +++++ .../dynamicpack/PacksContainer.kt | 103 +++++ .../dynamicpack/client/DynamicPackModBase.kt | 152 +++++++ .../dynamicpack/client/GameStartSyncing.kt | 150 +++++++ .../dynamicpack/client/PackMixinHelper.kt | 19 + .../dynamicpack/client/config/Config.kt | 151 +++++++ .../client/config/ConfigScreenBuilder.kt | 168 ++++++++ .../dynamicpack/client/config/NoYACLScreen.kt | 108 +++++ .../dynamicpack/client/gui/ContentsList.kt | 181 +++++++++ .../dynamicpack/client/gui/ContentsScreen.kt | 140 +++++++ .../client/gui/DynamicPackScreen.kt | 218 ++++++++++ .../DynamicPackResourcePackEntryWidget.kt | 81 ++++ .../gui/widget/ResourcePackEntryWidget.kt | 26 ++ .../dynamicpack/pack/AbstractPack.kt | 8 + .../dynamicpack/pack/DynamicResourcePack.kt | 254 ++++++++++++ .../dynamicpack/pack/ModrinthRemote.kt | 230 +++++++++++ .../dynamicpack/pack/Remote.kt | 45 +++ .../pack/dynamicrepo/BaseContent.kt | 63 +++ .../dynamicpack/pack/dynamicrepo/BaseEnum.kt | 95 +++++ .../pack/dynamicrepo/DynamicFile.kt | 26 ++ .../dynamicrepo/DynamicRepoPreferences.kt | 232 +++++++++++ .../pack/dynamicrepo/DynamicRepoRemote.kt | 79 ++++ .../dynamicrepo/DynamicRepoSyncBuilder.kt | 378 ++++++++++++++++++ .../platform/PlatformEntrypoint.kt | 128 ++++++ .../dynamicpack/platform/VersionFunctions.kt | 236 +++++++++++ .../platform/fabric/FabricDynamicPreLaunch.kt | 40 ++ .../platform/fabric/ModMenuIntegration.kt | 22 + .../dynamicpack/platform/forge/ForgeEvent.kt | 20 + .../platform/neoforge/NeoForgeEvent.kt | 20 + .../dynamicpack/sync/SyncBuilder.kt | 39 ++ .../dynamicpack/sync/SyncProgress.kt | 23 ++ .../dynamicpack/sync/SyncThread.kt | 70 ++++ .../dynamicpack/sync/SyncingTask.kt | 140 +++++++ .../dynamicpack/util/Hashes.kt | 25 ++ .../dynamicpack/util/JsonUtil.kt | 74 ++++ .../dynamicpack/util/LockUtil.kt | 39 ++ .../dynamicpack/util/PackUtil.kt | 112 ++++++ .../dynamicpack/util/PathUtil.kt | 174 ++++++++ .../calculatorsteam/dynamicpack/util/Urls.kt | 220 ++++++++++ .../dynamicpack/util/UrlsController.kt | 68 ++++ .../dynamicpack/util/enums/Loader.kt | 8 + .../dynamicpack/util/enums/OverrideType.kt | 39 ++ .../FailedOpenPackFileSystemException.kt | 11 + .../util/exception/TranslatableException.kt | 55 +++ .../dynamicpack/util/log/FileLog.kt | 31 ++ .../dynamicpack/util/log/LoopLog.kt | 20 + .../dynamicpack/util/log/NetworkStat.kt | 86 ++++ .../dynamicpack/util/log/Out.kt | 102 +++++ .../dynamicpack/util/status/StatusChecker.kt | 70 ++++ .../assets/dynamicpack/lang/en_us.json | 66 +++ .../assets/dynamicpack/lang/ru_ru.json | 67 ++++ .../assets/dynamicpack/select_button.png | Bin 0 -> 15312 bytes .../dynamicpack/select_button_syncing.png | Bin 0 -> 8677 bytes .../dynamicpack/select_button_warning.png | Bin 0 -> 21280 bytes src/main/resources/dynamicpack.mixins.json | 19 + src/main/resources/icon.png | Bin 0 -> 7506 bytes src/main/templates/META-INF/mods.toml | 30 ++ .../templates/META-INF/neoforge.mods.toml | 30 ++ src/main/templates/fabric.mod.json | 39 ++ src/main/templates/pack.mcmeta | 6 + src/test/kotlin/tests/InputValidatorTest.kt | 87 ++++ src/test/kotlin/tests/PackUtilTest.kt | 38 ++ .../kotlin/tests/SecurityTrustedUrlsTest.kt | 41 ++ src/test/kotlin/tests/UrlsTest.kt | 27 ++ src/test/kotlin/tests_files/filedir/file.txt | 1 + src/test/kotlin/tests_files/filezip.zip | Bin 0 -> 214 bytes stonecutter.gradle.kts | 23 ++ versions/1.20.1-fabric/gradle.properties | 12 + versions/1.20.1-fabric/logs/latest.log | 4 + versions/1.20.1-forge/gradle.properties | 12 + versions/1.21.1-fabric/gradle.properties | 12 + versions/1.21.1-fabric/logs/latest.log | 4 + versions/1.21.1-neoforge/gradle.properties | 12 + versions/1.21.3-fabric/gradle.properties | 12 + versions/1.21.3-neoforge/gradle.properties | 12 + versions/1.21.4-fabric/gradle.properties | 12 + versions/1.21.4-neoforge/gradle.properties | 12 + versions/1.21.5-fabric/gradle.properties | 12 + versions/1.21.5-neoforge/gradle.properties | 12 + versions/1.21.8-fabric/gradle.properties | 12 + versions/1.21.8-neoforge/gradle.properties | 12 + 101 files changed, 6899 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 README.md create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 modstitch.accesswidener create mode 100644 settings.gradle.kts create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/accessor/FilePackResourcesAccessor.java create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/mixins/FilePackResourcesMixin.java create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/mixins/MinecraftClientMixin.java create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/mixins/PackRepositoryMixin.java create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackEntryMixin.java create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackScreenMixin.java create mode 100644 src/main/java/com/calculatorsteam/dynamicpack/mixins/TitleScreenMixin.java create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/Constants.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/DynamicPackMod.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/InputValidator.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/PacksContainer.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/DynamicPackModBase.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/GameStartSyncing.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/PackMixinHelper.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/Config.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/ConfigScreenBuilder.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/NoYACLScreen.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/gui/ContentsList.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/gui/ContentsScreen.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/gui/DynamicPackScreen.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/gui/widget/DynamicPackResourcePackEntryWidget.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/client/gui/widget/ResourcePackEntryWidget.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/AbstractPack.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/DynamicResourcePack.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/ModrinthRemote.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/Remote.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/dynamicrepo/BaseContent.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/dynamicrepo/BaseEnum.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/dynamicrepo/DynamicFile.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/dynamicrepo/DynamicRepoPreferences.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/dynamicrepo/DynamicRepoRemote.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/pack/dynamicrepo/DynamicRepoSyncBuilder.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/platform/PlatformEntrypoint.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/platform/VersionFunctions.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/platform/fabric/FabricDynamicPreLaunch.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/platform/fabric/ModMenuIntegration.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/platform/forge/ForgeEvent.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/platform/neoforge/NeoForgeEvent.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/sync/SyncBuilder.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/sync/SyncProgress.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/sync/SyncThread.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/sync/SyncingTask.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/Hashes.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/JsonUtil.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/LockUtil.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/PackUtil.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/PathUtil.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/Urls.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/UrlsController.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/enums/Loader.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/enums/OverrideType.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/exception/FailedOpenPackFileSystemException.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/exception/TranslatableException.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/log/FileLog.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/log/LoopLog.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/log/NetworkStat.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/log/Out.kt create mode 100644 src/main/kotlin/com/calculatorsteam/dynamicpack/util/status/StatusChecker.kt create mode 100644 src/main/resources/assets/dynamicpack/lang/en_us.json create mode 100644 src/main/resources/assets/dynamicpack/lang/ru_ru.json create mode 100644 src/main/resources/assets/dynamicpack/select_button.png create mode 100644 src/main/resources/assets/dynamicpack/select_button_syncing.png create mode 100644 src/main/resources/assets/dynamicpack/select_button_warning.png create mode 100644 src/main/resources/dynamicpack.mixins.json create mode 100644 src/main/resources/icon.png create mode 100644 src/main/templates/META-INF/mods.toml create mode 100644 src/main/templates/META-INF/neoforge.mods.toml create mode 100644 src/main/templates/fabric.mod.json create mode 100644 src/main/templates/pack.mcmeta create mode 100644 src/test/kotlin/tests/InputValidatorTest.kt create mode 100644 src/test/kotlin/tests/PackUtilTest.kt create mode 100644 src/test/kotlin/tests/SecurityTrustedUrlsTest.kt create mode 100644 src/test/kotlin/tests/UrlsTest.kt create mode 100644 src/test/kotlin/tests_files/filedir/file.txt create mode 100644 src/test/kotlin/tests_files/filezip.zip create mode 100644 stonecutter.gradle.kts create mode 100644 versions/1.20.1-fabric/gradle.properties create mode 100644 versions/1.20.1-fabric/logs/latest.log create mode 100644 versions/1.20.1-forge/gradle.properties create mode 100644 versions/1.21.1-fabric/gradle.properties create mode 100644 versions/1.21.1-fabric/logs/latest.log create mode 100644 versions/1.21.1-neoforge/gradle.properties create mode 100644 versions/1.21.3-fabric/gradle.properties create mode 100644 versions/1.21.3-neoforge/gradle.properties create mode 100644 versions/1.21.4-fabric/gradle.properties create mode 100644 versions/1.21.4-neoforge/gradle.properties create mode 100644 versions/1.21.5-fabric/gradle.properties create mode 100644 versions/1.21.5-neoforge/gradle.properties create mode 100644 versions/1.21.8-fabric/gradle.properties create mode 100644 versions/1.21.8-neoforge/gradle.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5bb86c7 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,57 @@ +name: Gradle CI + +on: + push: + branches: + - '**' + paths-ignore: + - 'README.md' + - 'LICENSE' + - '.gitignore' + pull_request: + branches: + - '**' + paths-ignore: + - 'README.md' + - 'LICENSE' + - '.gitignore' + workflow_dispatch: +jobs: + build: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + runs-on: ${{ matrix.os }} + name: Build with gradle + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Java 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + - name: Set up Java 21 + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: temurin + - uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + ./.gradle/loom-cache + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Grant execute permission for gradlew + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: Build with Gradle + run: ./gradlew build --no-daemon + - uses: actions/upload-artifact@v4 + with: + name: artifact-${{ matrix.os }} + path: | + **/build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4a86cc6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ +run + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Kotlin ### +.kotlin + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..4709616 --- /dev/null +++ b/README.md @@ -0,0 +1,110 @@ +# Kotlin Modstitch Stonecutter Template + +This repository provides a **multi-loader Minecraft mod development template written in Kotlin**, designed for use with the **Modstitch** and **Stonecutter** Gradle plugins. It supports **Fabric**, **Forge**, and **NeoForge** targets across multiple Minecraft versions + +> πŸ› οΈ **Based on**: [isXander/modstitch-stonecutter-template](https://github.com/isXander/modstitch-stonecutter-template) β€” then modified to ensure it builds and runs successfully + +## πŸš€ Features + +- **Multi-Loader Support**: build for Fabric, Forge, and NeoForge from one codebase +- **Multi-Version Support**: 1.20.1 and 1.21.1 (easily extensible) +- **Kotlin-Ready**: JVM toolchain, compiler settings, and Kotlin integrations are fully preconfigured +- **CI-Ready**: GitHub Actions workflow for multiplatform builds +- **Stonecutter Integration**: powerful Gradle preprocessor and environment-specific configuration via properties +- **Modstitch-Powered**: leverages Modstitch to abstract loader-specific tasks +- **Mixin Support**: set up mixins with proper configuration + +``` +ExampleMod/ +β”œβ”€β”€ .github/workflows/build.yml # CI/CD configuration +β”œβ”€β”€ build.gradle.kts # Main build configuration +β”œβ”€β”€ stonecutter.gradle.kts # Multi-version build setup +β”œβ”€β”€ settings.gradle.kts # Gradle settings +β”œβ”€β”€ gradle.properties # Base project properties +β”œβ”€β”€ src/main/ +β”‚ β”œβ”€β”€ kotlin/ # Kotlin source code +β”‚ β”‚ └── com/author/examplemod/ +β”‚ β”‚ β”œβ”€β”€ ExampleMod.kt # Main mod class +β”‚ β”‚ └── platform/ # Platform-specific code +β”‚ β”œβ”€β”€ java/ # Java source (for Mixins) +β”‚ β”‚ └── com/author/examplemod/mixins/ +β”‚ β”œβ”€β”€ resources/ # Resources and configuration +β”‚ └── templates/ # Platform-specific templates +└── versions/ # Version-specific configurations + β”œβ”€β”€ 1.20.1-fabric/ + β”œβ”€β”€ 1.20.1-forge/ + β”œβ”€β”€ 1.21.1-fabric/ + └── 1.21.1-neoforge/ +``` + +## βš™οΈ Quick Start + +### Setup + +1. **Use this template** or clone the repository: + ```bash + git clone https://github.com/Riflusso/modstitch-kotlin-stonecutter-template.git + cd modstitch-kotlin-stonecutter-template + ``` + +2. **Configure your mod** by editing `gradle.properties`: + ```properties + modId=your_mod_id + modName=Your Mod Name + modDescription=Your mod description + modAuthor=Your Name + modGroup=com.yourname + ``` + +3. **Update package structure**: + - Rename packages from `com.author.examplemod` to match your `modGroup` + - Update imports and references accordingly + +4. **Test the setup** by running any version: + ```bash + # You can run any version regardless of which is active: + ./gradlew :1.21.1-fabric:runClient + ./gradlew :1.20.1-forge:runClient + ./gradlew :1.21.1-neoforge:runClient + ``` +5. **Build project** for every version: + ```bash + # Build all versions + ./gradlew build + ``` + Artifacts will appear under `versions/[version]/build/libs/` + +## πŸ“‹ Customization Guide + +### Adding New Minecraft Versions + +1. **Update `settings.gradle.kts`**: + ```kotlin + mc("1.22.0", loaders = listOf("fabric", "neoforge")) + ``` + +2. **Create version directory**: + ``` + # Version folders example + versions/1.22.0-fabric/gradle.properties + versions/1.22.0-neoforge/gradle.properties + ``` + +3. **Configure dependencies** in the new `gradle.properties` + +### Adding New Features + +1. **Main logic**: Add to `ExampleMod.kt` +2. **Platform/Version-specific code**: Use conditional compilation as in `PlatformEntrypoint.kt` +3. **Mixins**: Add to `src/main/java/.../mixins/` +4. **Resources**: Add to `src/main/resources/` + +## πŸ“š Resources + +- [Fabric Documentation](https://fabricmc.net/wiki/) +- [NeoForge Documentation](https://docs.neoforged.net/) +- [Forge Documentation](https://docs.minecraftforge.net/) +- [Stonecutter Documentation](https://stonecutter.kikugie.dev/) +- [Modstitch Documentation](https://isXander.github.io/modstitch-docs/) +- [KotlinForForge](https://github.com/TheDarkColour/KotlinForForge) +- [Fabric Language Kotlin](https://github.com/FabricMC/fabric-language-kotlin) \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f8369e1 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,189 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.util.Locale + +plugins { + id("dev.kikugie.stonecutter") + id("dev.isxander.modstitch.base") + kotlin("jvm") + `maven-publish` +} + +// ========== Versions & Project Info ========== +val mcVersion: String by project +val versionWithoutMC = property("modVersion")!!.toString() + +val isDev = resolveProp("isDev") +val isAlpha = "-a" in versionWithoutMC +val isBeta = "-b" in versionWithoutMC + +val isFabric = modstitch.isLoom +val isNeoforge = modstitch.isModDevGradleRegular +val isForge = modstitch.isModDevGradleLegacy +val isForgeLike = modstitch.isModDevGradle + +val loader = when { + isFabric -> "fabric" + isNeoforge -> "neoforge" + isForge -> "forge" + else -> error("Unknown loader") +} + +val javaTargetVersion = if (stonecutter.eval(mcVersion, ">1.20.4")) 21 else 17 +val resolvedModId = resolveProp("modId") ?: error("modId is required") +val gitHash = gitHash() + +// ========== ModStitch Setup ========== +modstitch { + minecraftVersion = mcVersion + javaVersion = javaTargetVersion + + if (!isForge) { + unitTesting() + } + + kotlin { + jvmToolchain(javaVersion.get()) + compilerOptions.jvmTarget.set(JvmTarget.fromTarget(javaVersion.get().toString())) + } + + parchment { + mappingsVersion = resolveProp("parchment.version") + minecraftVersion = resolveProp("parchment.minecraft") + } + + metadata { + modId = resolvedModId + modName = resolveProp("modName") + modVersion = "$versionWithoutMC${if (isAlpha || isBeta) "." else "+"}${stonecutter.current.project}${if (isDev?.lowercase(Locale.getDefault()) == "true" || isDev == "1") "-DEV-$gitHash" else ""}" + modGroup = resolveProp("modGroup") + modDescription = resolveProp("modDescription") + modLicense = resolveProp("modLicense") + modAuthor = resolveProp("modAuthor") + + replacementProperties.put( + "pack_format", when (mcVersion) { + "1.19.2" -> 9 + "1.20.1" -> 15 + "1.21.1" -> 34 + "1.21.3" -> 57 + "1.21.4" -> 61 + "1.21.5" -> 71 + "1.21.8" -> 81 + else -> throw IllegalArgumentException("Please store the resource pack version for $mcVersion in build.gradle.kts! https://minecraft.wiki/w/Pack_format") + }.toString() + ) + + replacementProperties.put("gitHead", gitHash) + + // replacementProperties DSL + fun setReplace(key: String, property: String) { + resolveProp(property)?.let { replacementProperties.put(key, it) } + } + + setReplace("github", "githubProject") + setReplace("mc", "meta.mcDep") + setReplace("fabricLoader", "deps.fabricLoader") + setReplace("fabricLangKotlin", "deps.fabricLangKotlin") + setReplace("fapi", "deps.fabricApi") + } + + loom { + resolveProp("deps.fabricLoader")?.let { fabricLoaderVersion = it } + } + + moddevgradle { + resolveProp("deps.neoforge")?.let { neoForgeVersion = it } + resolveProp("deps.forge")?.let { forgeVersion = it } + defaultRuns() + + configureNeoForge { + runs.all { + jvmArguments.add("-Dmixin.debug.export=true") + } + } + + modstitch.onEnable { + tasks.named("createMinecraftArtifacts") { + dependsOn("stonecutterGenerate") + } + } + } + + mixin { + addMixinsToModManifest = true + configs.register(resolvedModId) + } +} + +// ========== Stonecutter ========== +stonecutter { + constants { + put("fabric", isFabric) + put("neoforge", isNeoforge) + put("forge", isForge) + put("forgelike", isForgeLike) + } + + dependencies { + put("fapi", resolveProp("deps.fabricApi") ?: "0.0.0") + } +} + +// ========== Dependencies ========== +dependencies { + if (isFabric) { + modstitchModImplementation("net.fabricmc.fabric-api:fabric-api:${resolveProp("deps.fabricApi")}") + modstitchModImplementation("net.fabricmc:fabric-language-kotlin:${resolveProp("deps.fabricLangKotlin")}") + + modstitchModImplementation("com.terraformersmc:modmenu:${resolveProp("deps.modmenu")}") + } + + if (isNeoforge) { + modstitchModRuntimeOnly("thedarkcolour:kotlinforforge-neoforge:${resolveProp("deps.kotlinForForge")}") + } + + if (isForge) { + modstitchModRuntimeOnly("thedarkcolour:kotlinforforge:${resolveProp("deps.kotlinForForge")}") + compileOnly("org.jetbrains:annotations:20.1.0") + } + + modstitchModApi("dev.isxander:yet-another-config-lib:${resolveProp("deps.yacl")}") { + exclude(group = "thedarkcolour") + } +} + +// ========== Tasks ========== +tasks { + withType().configureEach { + compilerOptions { + jvmTarget = modstitch.javaVersion.map { JvmTarget.fromTarget(it.toString()) } + } + dependsOn("stonecutterGenerate") + } + + named("generateModMetadata") { + dependsOn("stonecutterGenerate") + } + + if (isForge) { + named("test") { + enabled = false + } + } +} + +// ========== Helpers ========== +fun resolveProp(property: String): String? = + System.getenv(property)?.takeIf { it.isNotBlank() } + ?: findProperty(property)?.toString()?.takeIf { it.isNotBlank() } + +fun gitHash(): String { + val process = ProcessBuilder("git", "rev-parse", "--short", "HEAD") + .redirectErrorStream(true) // combine stdout + stderr + .start() + + val text = process.inputStream.bufferedReader().use { it.readText() } + + return text.trim() +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..647e9ea --- /dev/null +++ b/gradle.properties @@ -0,0 +1,16 @@ +isDev=false +modId=dynamicpack +modName=DynamicPack +modDescription=Adds auto-update support for resource packs +modLicense=MIT +modAuthor=AdamCalculator, Riflusso +modGroup=com.calculatorsteam +modVersion=1.2-b + +githubProject=CalculatorsTeam/DynamicPack + +deps.fabricLoader=0.17.2 +deps.fabricLangKotlin=1.13.6+kotlin.2.2.20 + +org.gradle.jvmargs=-Xmx4G +org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/modstitch.accesswidener b/modstitch.accesswidener new file mode 100644 index 0000000..cf997b3 --- /dev/null +++ b/modstitch.accesswidener @@ -0,0 +1,3 @@ +accessWidener v1 named +accessible method net/minecraft/client/gui/components/AbstractSelectionList getRowTop (I)I +accessible class net/minecraft/server/packs/FilePackResources$SharedZipFileAccess diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..5e27fb2 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,35 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven("https://maven.fabricmc.net/") + maven("https://maven.architectury.dev") + maven("https://maven.neoforged.net/releases/") + maven("https://maven.minecraftforge.net/") + maven("https://maven.kikugie.dev/releases") + maven("https://maven.kikugie.dev/snapshots") + maven("https://maven.isxander.dev/releases") + } +} + +plugins { + id("dev.kikugie.stonecutter") version "0.7.10" +} + +stonecutter { + kotlinController = true + centralScript = "build.gradle.kts" + + create(rootProject) { + fun mc(mcVersion: String, name: String = mcVersion, loaders: Iterable) = + loaders.forEach { version("$name-$it", mcVersion) } + + mc("1.20.1", loaders = listOf("fabric", "forge")) + mc("1.21.1", loaders = listOf("fabric", "neoforge")) + mc("1.21.3", loaders = listOf("fabric", "neoforge")) + mc("1.21.4", loaders = listOf("fabric", "neoforge")) + mc("1.21.5", loaders = listOf("fabric", "neoforge")) + mc("1.21.8", loaders = listOf("fabric", "neoforge")) + } +} +rootProject.name = "DynamicPack" \ No newline at end of file diff --git a/src/main/java/com/calculatorsteam/dynamicpack/accessor/FilePackResourcesAccessor.java b/src/main/java/com/calculatorsteam/dynamicpack/accessor/FilePackResourcesAccessor.java new file mode 100644 index 0000000..b34202c --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/accessor/FilePackResourcesAccessor.java @@ -0,0 +1,9 @@ +package com.calculatorsteam.dynamicpack.accessor; + +import java.io.File; + +public interface FilePackResourcesAccessor { + boolean dynamicpack$isClosed(); + File dynamicpack$getFile(); + void dynamicpack$close(); +} \ No newline at end of file diff --git a/src/main/java/com/calculatorsteam/dynamicpack/mixins/FilePackResourcesMixin.java b/src/main/java/com/calculatorsteam/dynamicpack/mixins/FilePackResourcesMixin.java new file mode 100644 index 0000000..7676b35 --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/mixins/FilePackResourcesMixin.java @@ -0,0 +1,58 @@ +package com.calculatorsteam.dynamicpack.mixins; + +import com.calculatorsteam.dynamicpack.accessor.FilePackResourcesAccessor; +import com.calculatorsteam.dynamicpack.util.LockUtils; +import net.minecraft.server.packs.FilePackResources; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.io.File; +import java.util.zip.ZipFile; + +@Mixin(FilePackResources./*? if >=1.21 {*/SharedZipFileAccess./*?}*/class) +public abstract class FilePackResourcesMixin implements FilePackResourcesAccessor { + + @Unique private boolean dynamicpack$opened; + + @Shadow public abstract void close(); + + @Shadow @Final + //? if < 1.21 + /*private*/ + File file; + + @Inject(at = @At("RETURN"), method = "getOrCreateZipFile") + public void dynamicpack$return$getOrCreateZipFile(CallbackInfoReturnable cir) { + ZipFile ret = cir.getReturnValue(); + if (ret != null) { + dynamicpack$opened = true; // Ρ‚Π΅ΠΏΠ΅Ρ€ΡŒ Π΄Π΅ΠΉΡΡ‚Π²ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ ΠΎΡ‚ΠΊΡ€Ρ‹Ρ‚ + LockUtils.addFileToOpened(this); + } + } + + @Inject(at = @At("RETURN"), method = "close") + public void dynamicpack$return$close(CallbackInfo ci) { + dynamicpack$opened = false; + } + + @Override + public boolean dynamicpack$isClosed() { + return !dynamicpack$opened; + } + + @Override + public File dynamicpack$getFile() { + return file; + } + + @Override + public void dynamicpack$close() { + close(); + } +} \ No newline at end of file diff --git a/src/main/java/com/calculatorsteam/dynamicpack/mixins/MinecraftClientMixin.java b/src/main/java/com/calculatorsteam/dynamicpack/mixins/MinecraftClientMixin.java new file mode 100644 index 0000000..05f3923 --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/mixins/MinecraftClientMixin.java @@ -0,0 +1,18 @@ +package com.calculatorsteam.dynamicpack.mixins; + +import com.calculatorsteam.dynamicpack.client.PackMixinHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.main.GameConfig; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +@Mixin(Minecraft.class) +public abstract class MinecraftClientMixin { + @Inject(at = @At("RETURN"), method = "") + private void dynamicpack$initCheck(GameConfig args, CallbackInfo ci) { + PackMixinHelper.minecraftInitReturned(); + } +} diff --git a/src/main/java/com/calculatorsteam/dynamicpack/mixins/PackRepositoryMixin.java b/src/main/java/com/calculatorsteam/dynamicpack/mixins/PackRepositoryMixin.java new file mode 100644 index 0000000..957b5c2 --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/mixins/PackRepositoryMixin.java @@ -0,0 +1,61 @@ +package com.calculatorsteam.dynamicpack.mixins; + +import com.calculatorsteam.dynamicpack.DynamicPackMod; +import com.calculatorsteam.dynamicpack.client.GameStartSyncing; +import com.calculatorsteam.dynamicpack.platform.VersionFunctions; +import com.calculatorsteam.dynamicpack.util.log.Out; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.Minecraft; +import net.minecraft.server.packs.repository.PackRepository; +import org.lwjgl.glfw.GLFW; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PackRepository.class) +public class PackRepositoryMixin { + + /** + * For freeze resource pack loading (only in game starting) until DynamicPack update it + */ + @Inject(at = @At("HEAD"), method = "reload") + private void dynamicpack$reload(CallbackInfo ci) { + // do nothing if minecraft initialized + if (DynamicPackMod.getInstance().isMinecraftInitialized()) { + return; + } + + Minecraft client = Minecraft.getInstance(); + GameStartSyncing syncing = DynamicPackMod.getGameStartSyncing(); + if (!syncing.isLockSupported()) { + return; + } + + if (syncing.getLockResourcesLoading()) { + syncing.startGameLocking(); + while (!client.getWindow().shouldClose() && syncing.getLockResourcesLoading()) { + if (!syncing.lockedTick()) { + break; + } + + try { + VersionFunctions.applyModelViewMatrix(); + VersionFunctions.clearColor(0.074f + (((float)syncing.getPercentage() / 100f)), 0.04f, (float) (0.24f + (Math.sin(System.currentTimeMillis() / 300f) / 2)), 1f); + VersionFunctions.clear(16640); + GLFW.glfwSwapBuffers(client.getWindow().getWindow()); + + } catch (Exception e) { + Out.error("Error while manipulations with OpenGL", e); + } + + try { + Thread.sleep(50); + } catch (InterruptedException ignored) { + } + } + syncing.endGameLocking(); + } + } +} + diff --git a/src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackEntryMixin.java b/src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackEntryMixin.java new file mode 100644 index 0000000..8cde469 --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackEntryMixin.java @@ -0,0 +1,96 @@ +package com.calculatorsteam.dynamicpack.mixins; + +import com.calculatorsteam.dynamicpack.client.gui.widget.DynamicPackResourcePackEntryWidget; +import com.calculatorsteam.dynamicpack.client.gui.widget.ResourcePackEntryWidget; +import com.calculatorsteam.dynamicpack.platform.VersionFunctions; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.packs.TransferableSelectionList; +import net.minecraft.client.gui.screens.packs.PackSelectionModel; +import net.minecraft.resources.ResourceLocation; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(TransferableSelectionList.PackEntry.class) +public abstract class ResourcePackEntryMixin { + + @Shadow + protected abstract boolean showHoverOverlay(); + + @Shadow + @Final + private PackSelectionModel.Entry pack; + @Shadow + @Final + private TransferableSelectionList parent; + + @Unique + int dynamicpack$selected = -1; + @Unique + private Boolean fold; + @Unique + int dynamicpack$foldTicks = 0; + @Unique + private static final int maxFoldTicks = 10; + @Unique + private static final ResourcePackEntryWidget DYNAMIC_WIDGET = new DynamicPackResourcePackEntryWidget(); + + @Inject(at = @At("TAIL"), + method = "render(Lnet/minecraft/client/gui/GuiGraphics;IIIIIIIZF)V") + private void render(GuiGraphics context, int index, int y, int x, int entryWidth, int entryHeight, + int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo info) { + int prevMargin = 0; + /*? if >=1.21 {*/ + int deltaX = 3 + (VersionFunctions.maxScrollAmount(parent) > 0 ? 7 : 0); + /*?} else {*/ + /*int deltaX = 8 + (parent.getMaxScroll() > 0 ? 7 : 0); + *//*?}*/ + boolean selectable = showHoverOverlay(); + dynamicpack$selected = -1; + if (dynamicpack$foldTicks == maxFoldTicks) { + /*? if >=1.21 {*/ + VersionFunctions.blitSprite(context, ResourceLocation.withDefaultNamespace("transferable_list/unselect"), + x + entryWidth - 16 - deltaX, y + entryWidth / 20 - 16, 16, 32); + /*?} else {*/ + /*context.blit(new ResourceLocation("textures/gui/resource_packs.png"), + x + entryWidth - 16 - deltaX, y + entryWidth / 20 - 16, 32.0F, 0.0F, 16, 32, 256, 256); + *//*?}*/ + } else { + ResourcePackEntryWidget widget = DYNAMIC_WIDGET; + if (widget.isVisible(pack, selectable)) { + deltaX += Math.max(prevMargin, widget.getXMargin(pack)); + int width = widget.getWidth(pack); + int height = widget.getHeight(pack, entryHeight); + int entryX = x + entryWidth - (deltaX + width) * (maxFoldTicks - dynamicpack$foldTicks) / maxFoldTicks; + int entryY = y + widget.getY(pack, entryHeight); + deltaX += width; + boolean widgetHovered = mouseX <= entryX + width && mouseX >= entryX && + mouseY <= entryY + height && mouseY >= entryY; + widget.render(pack, context, entryX, entryY, widgetHovered, tickDelta); + if (widgetHovered) dynamicpack$selected = 0; // фиксированный индСкс + prevMargin = widget.getXMargin(pack); + } + } + if (fold == null) fold = deltaX > 48; + if (!fold) return; + int mouseRange = Math.max(10, deltaX) + 40; + if (mouseX >= x + entryWidth - mouseRange && mouseX <= x + entryWidth && + mouseY <= y + entryHeight && mouseY >= y) + dynamicpack$foldTicks = Math.max(dynamicpack$foldTicks - 1, 0); + else + dynamicpack$foldTicks = Math.min(dynamicpack$foldTicks + 1, maxFoldTicks); + } + + @Inject(method = "mouseClicked(DDI)Z", at = @At("RETURN"), cancellable = true) + private void dynamicpack$afterMouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { + if (dynamicpack$selected != -1) { + cir.setReturnValue(false); + DYNAMIC_WIDGET.onClick(pack); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackScreenMixin.java b/src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackScreenMixin.java new file mode 100644 index 0000000..2f0f7c4 --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/mixins/ResourcePackScreenMixin.java @@ -0,0 +1,20 @@ +package com.calculatorsteam.dynamicpack.mixins; + +import com.calculatorsteam.dynamicpack.client.PackMixinHelper; +import net.minecraft.client.gui.screens.packs.PackSelectionScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PackSelectionScreen.class) +public class ResourcePackScreenMixin { + /** + * For auto-rescan packs + */ + @Inject(at = @At("RETURN"), method = "populateLists") + private void dynamicpack$updatePackLists(CallbackInfo ci) { + PackMixinHelper.updatePacksMinecraftRequest(); + } +} + diff --git a/src/main/java/com/calculatorsteam/dynamicpack/mixins/TitleScreenMixin.java b/src/main/java/com/calculatorsteam/dynamicpack/mixins/TitleScreenMixin.java new file mode 100644 index 0000000..7a39d15 --- /dev/null +++ b/src/main/java/com/calculatorsteam/dynamicpack/mixins/TitleScreenMixin.java @@ -0,0 +1,25 @@ +package com.calculatorsteam.dynamicpack.mixins; + +import com.calculatorsteam.dynamicpack.Constants; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.util.Mth; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(TitleScreen.class) +public class TitleScreenMixin { + @Inject(at = @At("TAIL"), method = "render") + public void dynamicpack$render(GuiGraphics guiGraphics, int i, int j, float f, CallbackInfo ci) { + if (Constants.DEBUG) { + int k = Mth.ceil(Math.abs(Math.sin(((double) System.currentTimeMillis()) / 350d)) * 255.0f) << 24; + guiGraphics.drawString(Minecraft.getInstance().font, Component.literal("DynamicPack mod is DEBUG").withStyle(ChatFormatting.BOLD).append(Component.literal(" use a release version for stable behavior").withStyle(ChatFormatting.YELLOW)), 2, guiGraphics.guiHeight() - 20, 0xFF2222 | k); + } + } +} + diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/Constants.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/Constants.kt new file mode 100644 index 0000000..3d5fe84 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/Constants.kt @@ -0,0 +1,163 @@ +package com.calculatorsteam.dynamicpack + +import com.calculatorsteam.dynamicpack.util.log.Out +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import java.io.IOException +import java.net.URI +import java.net.URISyntaxException + +object Constants { + // DISABLE ALL DEBUG IN OFFICIAL RELEASES + const val DEBUG: Boolean = false // Don't forget to disable in release + const val DEBUG_ALLOW_UNSECURE: Boolean = false + @JvmField var DEBUG_LOGS: Boolean = false + + const val VERSION_BUILD: Long = 50 + const val VERSION_NAME_MOD: String = "1.2" + /*? if >=1.21.6 {*/ + const val VERSION_NAME_BRANCH: String = "mc1.21.8" + /*?} else if >=1.21.5 {*/ + /*const val VERSION_NAME_BRANCH: String = "mc1.21.5" + *//*?} else if >=1.21.4 {*/ + /*const val VERSION_NAME_BRANCH: String = "mc1.21.4" + *//*?} else if >=1.21.2 {*/ + /*const val VERSION_NAME_BRANCH: String = "mc1.21.3" + *//*?} else if >=1.21 {*/ + /*const val VERSION_NAME_BRANCH: String = "mc1.21.1" + *//*?} else if >=1.20 {*/ + /*const val VERSION_NAME_BRANCH: String = "mc1.20.1" + *//*?}*/ + val VERSION_NAME: String = "$VERSION_NAME_MOD+$VERSION_NAME_BRANCH${if (DEBUG) "-debug" else ""}" + const val MOD_ID: String = "dynamicpack" + + // NOTE: for increase contact to mod developer. + val DYNAMIC_PACK_HTTPS_FILE_SIZE_LIMIT: Long = megabyte(8) // 8 MB + val MODRINTH_HTTPS_FILE_SIZE_LIMIT: Long = megabyte(1024) // 1 GB + val MOD_MODTINTH_API_LIMIT: Long = megabyte(8) // 8 MB + val GZIP_LIMIT: Long = megabyte(50) // 50 MB + val MOD_FILES_LIMIT: Long = megabyte(8) + const val MODRINTH_URL: String = "https://modrinth.com/mod/dynamicpack" + val NETWORK_STAT_RESET_LIMIT: Long = megabyte(3) + + // Settings + const val MAX_ATTEMPTS_TO_DOWNLOAD_FILE: Int = 3 + const val TEMP_DIR_NAME: String = "dynamicpack_f02ffd55_cd44_458a_8d58_e31b11313a53" + @JvmField var URLS_BUFFER_SIZE: Int = 1024 + + // const + const val HTTP_MINIMAL_HEADER_SIZE: Long = 24 + const val CLIENT_FILE: String = "dynamicmcpack.json" + const val MINECRAFT_META: String = "pack.mcmeta" + val UNKNOWN_PACK_MCMETA: String = """ + { + "pack": { + "pack_format": 17, + "description": "Unknown DynamicPack resource-pack..." + } + } + """.trimIndent() + + @JvmField val GSON: Gson = GsonBuilder().setPrettyPrinting().create() + + // --- Hosts --- + private val ALLOWED_HOSTS: MutableSet = buildSet { + add("modrinth.com") + add("github.com") + add("github.io") + add("githubusercontent.com") // better use github pages + if (isLocalHostAllowed()) { + add("localhost") + } + }.toMutableSet() + + /** + * API FOR MODPACKERS etc all-in-one packs + * @param host host to add. + * @param requester any object. It is recommended that .toString explicitly give out your name. + */ + @Throws(Exception::class) + internal fun addAllowedHosts(host: String?, requester: Any?) { + if (host == null || requester == null) { + Out.securityWarning("Try to add allowed hosts is failed: null host or requester") + throw Exception("Try to add allowed hosts is failed: null host or requester") + } + + Out.securityWarning("==== SECURITY WARNING ====") + Out.securityWarning("# The DynamicPack mod limits the hosts it can interact with.") + Out.securityWarning("# But a certain requester allowed the mod another host to interact with") + Out.securityWarning("# ") + Out.securityWarning("# Host: $host") + Out.securityWarning("# Requester: $requester") + Out.securityWarning("# StackTrace:") + Out.securityStackTrace() + Out.securityWarning("# ") + Out.securityWarning("===========================") + + ALLOWED_HOSTS += host + } + + @Throws(URISyntaxException::class) + fun getUrlHost(url: String): String? = URI(url).host + + @Throws(IOException::class) + fun isUrlHostTrusted(url: String): Boolean { + return try { + val host = getUrlHost(url) ?: return false + when { + host in ALLOWED_HOSTS -> true + ALLOWED_HOSTS.any { host.endsWith(".$it") } -> true + else -> { + Out.warn("Check trusted(false): $host") + false + } + } + } catch (e: Exception) { + throw IOException("Error while check url for trust", e) + } + } + + fun megabyte(mb: Long): Long = 1024L * 1024L * mb + + fun speedToString(bytesPerSec: Long): String = when { + bytesPerSec >= 1024 * 1024 -> "${bytesPerSec / 1024 / 1024} MiB/s" + bytesPerSec >= 1024 -> "${bytesPerSec / 1024} KiB/s" + else -> "$bytesPerSec B/s" + } + + fun secondsToString(s: Long): String = when { + s > 3600 -> "${s / 3600}h" + s > 60 -> "${s / 60}m" + else -> "${s}s" + } + + fun isBlockAllNotTrustedNetworks(): Boolean = true + + // TRUE FOR ALL PUBLIC VERSION!!!!!! + // false is equal not safe!1!!! + fun isRelease(): Boolean = !DEBUG + + // localhost allowed RELEASE=false + fun isLocalHostAllowed(): Boolean = DEBUG_ALLOW_UNSECURE + + // file_debug_only:// allowed RELEASE=false + fun isFileDebugSchemeAllowed(): Boolean = DEBUG_ALLOW_UNSECURE + + // http:// allowed RELEASE=false + fun isHTTPTrafficAllowed(): Boolean = false + + fun debugNetwork(bytesRead: Int, total: Long) { + if (isRelease()) return + if (true) return // Забавная ΠΏΡ€ΠΎΠ²Π΅Ρ€ΠΊΠ° :) оставим сСмантику ΠΊΠ°ΠΊ Π΅ΡΡ‚ΡŒ. + + try { + Thread.sleep(200) + } catch (e: InterruptedException) { + throw RuntimeException(e) + } + } + + fun isDebugLogs(): Boolean = DEBUG_LOGS + + fun isDebugMessageOnWorldJoin(): Boolean = DEBUG +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/DynamicPackMod.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/DynamicPackMod.kt new file mode 100644 index 0000000..48a376b --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/DynamicPackMod.kt @@ -0,0 +1,130 @@ +package com.calculatorsteam.dynamicpack + +import com.calculatorsteam.dynamicpack.client.GameStartSyncing +import com.calculatorsteam.dynamicpack.client.config.Config +import com.calculatorsteam.dynamicpack.pack.DynamicResourcePack +import com.calculatorsteam.dynamicpack.pack.Remote +import com.calculatorsteam.dynamicpack.util.enums.Loader +import com.calculatorsteam.dynamicpack.util.log.Out +import org.jetbrains.annotations.ApiStatus +import java.io.File +import java.nio.charset.StandardCharsets +import java.nio.file.Files + +/** + * Base mod entry, singleton instance kept in [instance]. + */ +abstract class DynamicPackMod protected constructor() { + + private lateinit var loader: Loader + private lateinit var gameDir: File // .minecraft + private lateinit var configDir: File // *gamedir*/config/dynamicpack + private lateinit var configFile: File // *configDir*/config.json + private var _config: Config? = null + private lateinit var packsContainer: PacksContainer + private lateinit var gameStartSyncing: GameStartSyncing + private var minecraftInitialized: Boolean = false + + companion object { + private var INSTANCE: DynamicPackMod? = null + + @JvmStatic + val instance: DynamicPackMod + get() = INSTANCE ?: throw IllegalStateException("Mod not initialized") + + @JvmStatic + val config: Config + get() = instance._config ?: error("Config not initialized!") + + @JvmStatic + @ApiStatus.AvailableSince("1.0.30") + @Throws(Exception::class) + fun addAllowedHosts(host: String, requester: Any) { + Constants.addAllowedHosts(host, requester) + } + + @JvmStatic + fun isNameIsDynamic(name: String): Boolean = + instance.packsContainer.getByFileName(name.removePrefix("file/")) != null + + @JvmStatic + fun getDynamicPackByMinecraftName(name: String): DynamicResourcePack? { + return instance.packsContainer.getByFileName(name.removePrefix("file/")) + } + + @JvmStatic + fun isResourcePackActive(pack: DynamicResourcePack): Boolean { + val optionsFile = File(instance.gameDir, "options.txt") + val lines: List = try { + Files.readAllLines(optionsFile.toPath(), StandardCharsets.UTF_8) + } catch (e: Exception) { + Out.println("options.txt not exists or failed to parse.. isResourcePackActive => false.") + return false + } + + return lines.any { line -> + line.startsWith("resourcePacks:") && line.contains(pack.minecraftId) + } + } + + @JvmStatic val gameDir: File get() = instance.gameDir + @JvmStatic val packsContainer: PacksContainer get() = instance.packsContainer + @JvmStatic val loader: Loader get() = instance.loader + @JvmStatic val gameStartSyncing: GameStartSyncing get() = instance.gameStartSyncing + @JvmStatic val configDir: File get() = instance.configDir + @JvmStatic val configFile: File get() = instance.configFile + } + + protected var manuallySyncThreadCounter: Int = 0 + + /** + * Основная инициализация ΠΌΠΎΠ΄Π°. + */ + open fun init(gameDir: File, loader: Loader) { + if (INSTANCE != null) throw RuntimeException("Already initialized!") + INSTANCE = this + this.gameDir = gameDir + this.loader = loader + + // *gamedir*/resourcepacks + val resourcePacks = File(gameDir, "resourcepacks") + resourcePacks.mkdirs() + + this.configDir = File(gameDir, "config/dynamicpack").apply { mkdirs() } + this.configFile = File(configDir, "config.json") + + // ΠŸΠ΅Ρ€Π΅Π΄Π°Ρ‘ΠΌ ΠΏΡƒΡ‚ΡŒ Π²Π½ΡƒΡ‚Ρ€ΡŒ Config ΠΏΠ΅Ρ€Π΅Π΄ Π·Π°Π³Ρ€ΡƒΠ·ΠΊΠΎΠΉ! + Config.fileRef = this.configFile + val loadedConfig = Config.load() + this._config = loadedConfig + + Remote.initRemoteTypes() + Out.init() + Out.println("Mod version: ${Constants.VERSION_NAME} build: ${Constants.VERSION_BUILD}") + + this.packsContainer = PacksContainer(resourcePacks) + this.packsContainer.rescan() + this.gameStartSyncing = GameStartSyncing() + + if (loadedConfig.isAutoUpdateAtLaunch()) { + this.gameStartSyncing.start() + } + } + + // == ABSTRACT API == + abstract fun isModExists(id: String): Boolean + /** Manually re-sync all supported packs */ + abstract fun startManuallySync() + abstract fun startManuallySync(pack: DynamicResourcePack) + abstract fun needResourcesReload() + abstract fun getCurrentGameVersion(): String + @Throws(Exception::class) + abstract fun checkResourcePackMetaValid(s: String): Boolean + // == END ABSTRACT == + + fun minecraftInitialized() { + this.minecraftInitialized = true + } + + fun isMinecraftInitialized(): Boolean = minecraftInitialized +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/InputValidator.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/InputValidator.kt new file mode 100644 index 0000000..b4f1ca0 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/InputValidator.kt @@ -0,0 +1,109 @@ +package com.calculatorsteam.dynamicpack + +import com.calculatorsteam.dynamicpack.util.log.Out +import java.net.URISyntaxException +import java.nio.charset.StandardCharsets +import java.util.regex.Pattern + +/** + * Validates for [user/resourcepack-creator] input values + */ +object InputValidator { + private val CONTENT_ID_PATTERN: Pattern = Pattern.compile("^[a-z0-9_:-]{2,128}$") + private val PATH_PATTERN: Pattern = Pattern.compile("^[A-Za-z0-9_./() +-]{0,255}$") + private val URL_PATTERN: Pattern = Pattern.compile( + "(https?://)?(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)" + ) + + /** + * dynamic content id valid? + */ + @JvmStatic + fun isDynamicContentIdValid(contentId: String?): Boolean = + contentId != null && CONTENT_ID_PATTERN.matcher(contentId).matches() + + /** + * Throw if content id invalid + */ + @JvmStatic + fun throwIsContentIdInvalid(contentId: String?) { + if (!isDynamicContentIdValid(contentId)) { + throw RuntimeException("Id of content is not valid: ${safeOutput(contentId ?: "")}") + } + } + + /** + * Is dynamic_repo content name valid? + */ + @JvmStatic + fun isDynamicContentNameValid(contentName: String?): Boolean = + contentName?.trim()?.let { + it.length < 64 && it.isNotEmpty() && + !it.contains("\n") && !it.contains("\r") && !it.contains("\b") + } ?: false + + /** + * Dynamic pack name valid? + */ + @JvmStatic + fun isDynamicPackNameValid(name: String?): Boolean = + name?.trim()?.let { + it.length < 64 && it.isNotEmpty() && + !it.contains("\n") && !it.contains("\r") && !it.contains("\b") + } ?: false + + /** + * Throw if local path invalid + */ + @JvmStatic + fun throwIsPathInvalid(path: String?) { + if (path == null) { + throw SecurityException("Null path", NullPointerException("path to valid is null")) + } + + val trim = path.trim() + if (trim.length < 2 || !PATH_PATTERN.matcher(path).matches()) { + val safe = path.toByteArray(StandardCharsets.US_ASCII).toString(StandardCharsets.US_ASCII) + throw SecurityException("Not valid path: $safe") + } + } + + /** + * Is URL valid? + */ + @JvmStatic + fun isUrlValid(url: String): Boolean { + try { + if (Constants.isLocalHostAllowed() && Constants.getUrlHost(url) == "localhost") { + Out.warn("isUrlValid return true for localhost! Behavior only when isLocalHostAllowed()=true") + return true + } + } catch (_: URISyntaxException) { } + return URL_PATTERN.matcher(url).matches() + } + + /** + * Throw if url invalid + */ + @JvmStatic + fun throwIsUrlInvalid(url: String?) { + if (url == null) { + throw SecurityException("null", NullPointerException("url to valid is null")) + } + if (!isUrlValid(url)) { + throw SecurityException("Not valid url: ${safeOutput(url)}") + } + } + + /** + * SHA1 valid? + */ + @JvmStatic + fun isHashValid(hash: String?): Boolean = + hash != null && hash.length == 40 && !hash.contains(" ") + + private fun safeOutput(s: String): String { + val short = if (s.length >= 100) s.take(100) else s + return short.toByteArray(StandardCharsets.US_ASCII).toString(StandardCharsets.US_ASCII) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/PacksContainer.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/PacksContainer.kt new file mode 100644 index 0000000..4930b94 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/PacksContainer.kt @@ -0,0 +1,103 @@ +package com.calculatorsteam.dynamicpack + +import com.calculatorsteam.dynamicpack.pack.DynamicResourcePack +import com.calculatorsteam.dynamicpack.util.JsonUtil +import com.calculatorsteam.dynamicpack.util.JsonUtil.optInt +import com.calculatorsteam.dynamicpack.util.PackUtil +import com.calculatorsteam.dynamicpack.util.PathUtil +import com.calculatorsteam.dynamicpack.util.log.Out +import com.calculatorsteam.dynamicpack.util.exception.FailedOpenPackFileSystemException +import java.io.File +import java.nio.file.Files +import java.nio.file.Path + +/** + * Container for supported packs + */ +class PacksContainer(private val directoryToCheck: File) { + + private var rescanPacksBlocked: Boolean = false + private var isPacksScanning: Boolean = false + + /** Current dynamic packs by filename */ + private val packs: MutableMap = mutableMapOf() + + fun lockRescan() { + rescanPacksBlocked = true + } + + fun unlockRescan() { + rescanPacksBlocked = false + } + + fun rescan() { + if (isPacksScanning) { + Out.warn("Already in scanning!") + return + } + if (rescanPacksBlocked) { + Out.warn("Rescan blocked! maybe currently syncing") + return + } + + isPacksScanning = true + val forDelete = packs.keys.toMutableList() + + PathUtil.listFiles(directoryToCheck)?.forEach { packFile -> + val currentDynamicPack = DynamicPackMod.getDynamicPackByMinecraftName("file/${packFile.name}") + if (currentDynamicPack?.isSyncing == true) { + Out.warn("WARNING: Found a pack that is now synchronizing. skipping this pack") + return@forEach + } + + try { + PackUtil.openPackFileSystem(packFile) { packPath -> + val clientFile = packPath.resolve(Constants.CLIENT_FILE) + if (Files.exists(clientFile)) { + Out.println("+ Pack ${packFile.name} supported by mod!") + processPack(packFile, clientFile) + forDelete.remove(packFile.name) + } else { + Out.println("- Pack ${packFile.name} not supported by mod.") + } + } + } catch (e: Exception) { + if (e is FailedOpenPackFileSystemException) { + Out.warn("Error while processing pack ${packFile.name}: ${e.message}") + } else { + Out.error("Error while processing pack: ${packFile.name}", e) + } + } + } + + forDelete.forEach { s -> + Out.println("Pack $s no longer exist or no longer support DynamicPack!") + packs.remove(s) + } + + isPacksScanning = false + } + + @Throws(Exception::class) + private fun processPack(location: File, clientFile: Path) { + val json = JsonUtil.readJson(clientFile) + val formatVersion = json.optInt("formatVersion") + val oldestPack = packs[location.name] + + if (formatVersion == 1) { + val pack = DynamicResourcePack(location, json).apply { + if (oldestPack != null) { + flashback(oldestPack) + } + } + packs[location.name] = pack + } else { + throw RuntimeException("Unsupported formatVersion for pack ${location.name}: $formatVersion") + } + } + + val packsArray: Array + get() = packs.values.toTypedArray() + + fun getByFileName(filename: String): DynamicResourcePack? = packs[filename] +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/client/DynamicPackModBase.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/DynamicPackModBase.kt new file mode 100644 index 0000000..ff323af --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/DynamicPackModBase.kt @@ -0,0 +1,152 @@ +package com.calculatorsteam.dynamicpack.client + +import com.calculatorsteam.dynamicpack.DynamicPackMod +import com.calculatorsteam.dynamicpack.Constants +import com.calculatorsteam.dynamicpack.pack.DynamicResourcePack +import com.calculatorsteam.dynamicpack.platform.VersionFunctions +import com.calculatorsteam.dynamicpack.util.status.StatusChecker +import com.calculatorsteam.dynamicpack.sync.SyncThread +import com.calculatorsteam.dynamicpack.util.log.Out +import com.google.gson.JsonElement +import com.google.gson.JsonObject +import com.google.gson.internal.LazilyParsedNumber +import net.minecraft.ChatFormatting +import net.minecraft.SharedConstants +import net.minecraft.client.Minecraft +import net.minecraft.client.gui.components.toasts.SystemToast +import net.minecraft.client.player.LocalPlayer +import net.minecraft.network.chat.Component +import net.minecraft.network.chat.Style +import net.minecraft.util.GsonHelper +import java.net.URI + +/** + * Base impl for DynamicPack mod (minecraft logic) + * 
+ * == inheritance tree ==
+ * DynamicPackMod - mod-related logic
+ * | DynamicPackModBase - minecraft-related logic
+ * . | fabric impl...
+ * . | forge impl...
+ * . | ...
+ *
+ */ +abstract class DynamicPackModBase : DynamicPackMod() { + + private var toast: SystemToast? = null + private var toastUpdated: Long = 0 + + fun setToastContent(title: Component, text: Component) { + if (!isMinecraftInitialized()) return + + val now = System.currentTimeMillis() + if (toast == null || (now - toastUpdated > 5000)) { + val toastManager = VersionFunctions.getToastManager() + toast = SystemToast( + VersionFunctions.getSystemToastId(), + title, + text + ).also { toastManager.addToast(it) } + } else { + toast?.reset(title, text) + } + toastUpdated = now + } + + private fun createDownloadComponent(): Component = + Component.translatable("dynamicpack.status_checker.download") + .withStyle( + Style.EMPTY + .withHoverEvent( + VersionFunctions.getHoverEventShowText( + Component.translatable( + "dynamicpack.status_checker.download.hover", + Component.literal(Constants.MODRINTH_URL) + .withStyle(ChatFormatting.UNDERLINE, ChatFormatting.AQUA) + ) + ) + ) + .withClickEvent( + VersionFunctions.getClickEventOpenUrl(Constants.MODRINTH_URL) + ) + ) + .withStyle(ChatFormatting.YELLOW, ChatFormatting.UNDERLINE) + + fun onWorldJoinForUpdateChecks(player: LocalPlayer?) { + if (Constants.isDebugMessageOnWorldJoin()) { + VersionFunctions.displayClientMessage( + player, + Component.literal("Debug message on world join") + .withStyle(ChatFormatting.GREEN) + ) + } + when { + player == null -> Out.warn("player == null on world join") + !StatusChecker.isSafe() -> { + VersionFunctions.displayClientMessage( + player, + Component.translatable( + "dynamicpack.status_checker.not_safe", + createDownloadComponent() + ) + ) + setToastContent( + Component.translatable("dynamicpack.status_checker.not_safe.toast.title"), + Component.translatable("dynamicpack.status_checker.not_safe.toast.description") + ) + } + !StatusChecker.isFormatActual() -> VersionFunctions.displayClientMessage( + player, + Component.translatable( + "dynamicpack.status_checker.format_not_actual", + createDownloadComponent() + ) + ) + + StatusChecker.isModUpdateAvailable() -> + Out.println("DynamicPack mod update available: ${Constants.MODRINTH_URL}") + + !StatusChecker.isChecked() -> + Out.warn("StatusChecker isChecked = false :(") + + else -> Out.println("Mod in actual state in current time!") + } + } + + override fun startManuallySync() { + SyncThread("SyncThread-${manuallySyncThreadCounter++}").start() + } + + override fun startManuallySync(pack: DynamicResourcePack) { + SyncThread("SyncThread-${manuallySyncThreadCounter++}", pack).start() + } + + override fun getCurrentGameVersion(): String { + SharedConstants.tryDetectVersion() + return VersionFunctions.versionName(SharedConstants.getCurrentVersion()) + } + + override fun checkResourcePackMetaValid(s: String): Boolean { + val pack: JsonObject = GsonHelper.parse(s).getAsJsonObject("pack") + if (pack["pack_format"].asNumber is LazilyParsedNumber) { + (pack["pack_format"].asNumber as LazilyParsedNumber).toInt() + } + val description: JsonElement = pack["description"] + if (description.isJsonNull) { + throw NullPointerException("description is null in pack.mcmeta") + } + return true + } + + override fun needResourcesReload() { + val client = Minecraft.getInstance() + if (client != null && client.level == null) { + client.execute { client.reloadResourcePacks() } + } else { + setToastContent( + Component.translatable("dynamicpack.toast.needReload"), + Component.translatable("dynamicpack.toast.needReload.description") + ) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/client/GameStartSyncing.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/GameStartSyncing.kt new file mode 100644 index 0000000..ad30ae8 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/GameStartSyncing.kt @@ -0,0 +1,150 @@ +package com.calculatorsteam.dynamicpack.client + +import com.calculatorsteam.dynamicpack.client.config.Config +import com.calculatorsteam.dynamicpack.DynamicPackMod +import com.calculatorsteam.dynamicpack.util.status.StatusChecker +import com.calculatorsteam.dynamicpack.sync.SyncBuilder +import com.calculatorsteam.dynamicpack.sync.SyncProgress +import com.calculatorsteam.dynamicpack.sync.SyncingTask +import com.calculatorsteam.dynamicpack.util.log.LoopLog +import com.calculatorsteam.dynamicpack.util.log.NetworkStat +import com.calculatorsteam.dynamicpack.util.log.Out +import java.nio.file.Path +import kotlin.time.Duration.Companion.seconds + +/** + * Syncing on game launch + */ +class GameStartSyncing : Thread("GameStartSyncingThread") { + + companion object { + private const val MAX_LOCK_MS = 1000 * 15 + } + + private var updateStartTime: Long = 0L // thread started time ms + private var lockStartTime: Long = 0L // lock started time ms + + /** locking resources loading (firstly true!) */ + var lockResourcesLoading: Boolean = true + private set + + var syncBuilder: SyncBuilder? = null + val etaLoopLog = LoopLog(1.seconds) + + init { + if (!Config.getInstance().isAutoUpdateAtLaunch()) { + Out.warn("Auto-update at launch disabled by config.") + unlock() + } + } + + /** + * Starting syncing... (thread entrypoint) + */ + override fun run() { + if (!Config.getInstance().isAutoUpdateAtLaunch()) { + Out.warn("Thread launched with isAutoUpdateAtLaunch=false; return") + return + } + + updateStartTime = System.currentTimeMillis() + Out.debug("[GameStartSyncing] thread started") + + SyncingTask.launchTaskAsSyncing { + try { + StatusChecker.check() // check status + SyncingTask.currentRootSyncBuilder = SyncingTask.rootSyncBuilder().also { builder -> + syncBuilder = builder + builder.init(ignoreCaches = false) + + if (builder.isUpdateAvailable) { + val reloadRequired = builder.doUpdate(createSyncProgress()) + if (!lockResourcesLoading && reloadRequired) { + DynamicPackMod.instance.needResourcesReload() + } + } + } + } catch (e: Exception) { + Out.error("Error while GameStartSyncing...", e) + } finally { + unlock() // unlock main thread! + SyncingTask.currentRootSyncBuilder = null + } + } + } + + private fun createSyncProgress(): SyncProgress = object : SyncProgress { + override fun setPhase(phase: String) { + Out.debug("Phase: $phase") + SyncingTask.log(phase) + } + + override fun downloading(name: String, percentage: Float) { + syncBuilder?.let { builder -> + val remainsBytes = builder.updateSize - builder.downloadedSize + val eta = NetworkStat.remainingETA(remainsBytes).also { SyncingTask.eta = it } + + if (etaLoopLog.tick()) { + Out.debug("(${SyncingTask.currentPackName}) ETA=${eta}s") + } + + // if locked and updating > 3 seconds + if (updateTime > 3000 && isLocked()) { + val shouldUnlock = eta * 1000 > (untilForceUnlock / 1.5f) + if (shouldUnlock) { + Out.debug("[GameStartSyncing] ETA ${eta}s. Unlocking main thread...") + unlock() + } + } + } + } + + override fun deleted(name: Path) { + Out.debug("Deleted: $name") + SyncingTask.log("Delete: ${name.fileName}") + } + } + + // Ссли ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ ΠΌΠΎΠ΄ΠΎΠ² β†’ ΠΏΠ΅Ρ€Π΅ΠΎΠΏΡ€Π΅Π΄Π΅Π»ΠΈΡ‚ΡŒ + fun isLockSupported(): Boolean = true + + fun lockedTick(): Boolean { + if (lockTime > MAX_LOCK_MS) { + Out.warn("Main thread unlocked forcibly because lock time >= 15s") + return false + } + return true + } + + val lockTime: Long + get() = System.currentTimeMillis() - lockStartTime + + val updateTime: Long + get() = System.currentTimeMillis() - updateStartTime + + val untilForceUnlock: Long + get() = MAX_LOCK_MS - lockTime + + fun endGameLocking() { + Out.println("Main thread locked for ${lockTime / 1000} seconds") + } + + fun startGameLocking() { + Out.println("Main thread locked by DynamicPack for updating resource packs...") + lockStartTime = System.currentTimeMillis() + } + + fun isLockStarted(): Boolean = lockStartTime != 0L + fun isLocked(): Boolean = isLockStarted() && lockResourcesLoading + + private fun unlock() { + lockResourcesLoading = false + } + + val percentage: Double + get() = syncBuilder?.let { b -> + if (b.downloadedSize > 0) + (b.downloadedSize.toDouble() / b.updateSize.toDouble()) * 100.0 + else 0.0 + } ?: 0.0 +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/client/PackMixinHelper.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/PackMixinHelper.kt new file mode 100644 index 0000000..b980982 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/PackMixinHelper.kt @@ -0,0 +1,19 @@ +package com.calculatorsteam.dynamicpack.client + +import com.calculatorsteam.dynamicpack.DynamicPackMod + +/** + * Helper for mixin hooks into Minecraft lifecycle. + */ +object PackMixinHelper { + + @JvmStatic + fun minecraftInitReturned() { + DynamicPackMod.instance.minecraftInitialized() + } + + @JvmStatic + fun updatePacksMinecraftRequest() { + DynamicPackMod.packsContainer.rescan() + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/Config.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/Config.kt new file mode 100644 index 0000000..8259005 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/Config.kt @@ -0,0 +1,151 @@ +package com.calculatorsteam.dynamicpack.client.config + +import com.calculatorsteam.dynamicpack.Constants +import com.calculatorsteam.dynamicpack.pack.dynamicrepo.DynamicRepoSyncBuilder +import com.calculatorsteam.dynamicpack.util.PathUtil +import com.calculatorsteam.dynamicpack.util.log.FileLog +import com.calculatorsteam.dynamicpack.util.log.Out +import java.io.File +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.StandardOpenOption + +/** + * Global config for DynamicPack. + */ +class Config private constructor() { + + @Transient + private var def: Boolean = false + + private var formatVersion: Int = 1 // do not touch + + private var networkBufferSize: Int = 1024 + fun getNetworkBufferSize(): Int = networkBufferSize + fun setNetworkBufferSize(value: Int) { + networkBufferSize = value + updateStaticVariables(this) + } + + private var networkMultithreadDownloadThreads: Int = 12 + fun getNetworkMultithreadDownloadThreads(): Int = networkMultithreadDownloadThreads + fun setNetworkMultithreadDownloadThreads(value: Int) { + networkMultithreadDownloadThreads = value + updateStaticVariables(this) + } + + private var logAllFilesChanges: Boolean = false + fun isLogAllFilesChanges(): Boolean = logAllFilesChanges + fun setLogAllFilesChanges(value: Boolean) { + logAllFilesChanges = value + updateStaticVariables(this) + } + + private var autoUpdateAtLaunch: Boolean = true + fun isAutoUpdateAtLaunch(): Boolean = autoUpdateAtLaunch + fun setAutoUpdateAtLaunch(value: Boolean) { + autoUpdateAtLaunch = value + } + + private var updateOnlyEnabledPacks: Boolean = true + fun isUpdateOnlyEnabledPacks(): Boolean = updateOnlyEnabledPacks + fun setUpdateOnlyEnabledPacks(value: Boolean) { + updateOnlyEnabledPacks = value + } + + private var debugIgnoreHiddenFlagInContents: Boolean = false + fun dynamicRepoIsIgnoreHiddenContentFlag(): Boolean = debugIgnoreHiddenFlagInContents + fun setDebugIgnoreHiddenFlagInContents(value: Boolean) { + debugIgnoreHiddenFlagInContents = value + } + + private var debugLogs: Boolean = false + fun isDebugLogs(): Boolean = debugLogs + fun setDebugLogs(value: Boolean) { + debugLogs = value + } + + private fun checkAndValidateConfig() { + var save = false + + if (networkBufferSize < 256) { + networkBufferSize = 256 + save = true + Out.warn("Config invalid 'networkBufferSize'. Sets to $networkBufferSize") + } + + if (networkMultithreadDownloadThreads !in 1..<256) { + networkMultithreadDownloadThreads = 8 + save = true + Out.warn("Config invalid 'networkMultithreadDownloadThreads'. Sets to $networkMultithreadDownloadThreads") + } + + if (save) save() + } + + fun save() { + if (def) throw RuntimeException("Can't save a DEF config!") + try { + val json = Constants.GSON.toJson(this) + val file: Path = fileRef!!.toPath() + PathUtil.delete(file) + PathUtil.createDirsToFile(file) + PathUtil.createFile(file) + Files.writeString(file, json, StandardOpenOption.WRITE) + } catch (e: Exception) { + Out.error("Config save failed :(", e) + } + } + + companion object { + @JvmField val DEF: Config = createDefConfig() + private var instance: Config? = null + internal var fileRef: File? = null + + private fun createDefConfig(): Config { + val cfg = Config() + cfg.def = true + return cfg + } + + @JvmStatic + fun load(): Config { + if (instance != null) throw RuntimeException("Config already loaded") + + val file = fileRef ?: throw RuntimeException("Config.fileRef not set before load()!") + + if (!file.exists()) { + val cfg = Config() + updateStaticVariables(cfg) + instance = cfg + return cfg + } + + return try { + val config = Constants.GSON.fromJson( + PathUtil.readString(file.toPath()), Config::class.java + ) + updateStaticVariables(config) + instance = config + config + } catch (e: Exception) { + Out.error("Config load failed (return default config)", e) + val fallback = Config() + updateStaticVariables(fallback) + instance = fallback + fallback + } + } + + private fun updateStaticVariables(config: Config) { + config.checkAndValidateConfig() + Constants.URLS_BUFFER_SIZE = config.networkBufferSize + Constants.DEBUG_LOGS = config.debugLogs + DynamicRepoSyncBuilder.DOWNLOAD_THREADS_COUNT = config.networkMultithreadDownloadThreads + FileLog.logAllChanges = config.logAllFilesChanges + } + + @JvmStatic + fun getInstance(): Config = instance ?: throw IllegalStateException("Config not initialized!") + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/ConfigScreenBuilder.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/ConfigScreenBuilder.kt new file mode 100644 index 0000000..ab8dfaa --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/ConfigScreenBuilder.kt @@ -0,0 +1,168 @@ +package com.calculatorsteam.dynamicpack.client.config + +import com.calculatorsteam.dynamicpack.DynamicPackMod +import com.calculatorsteam.dynamicpack.sync.SyncingTask +import dev.isxander.yacl3.api.* +import dev.isxander.yacl3.api.controller.BooleanControllerBuilder +import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder +import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder +import dev.isxander.yacl3.gui.YACLScreen +import dev.isxander.yacl3.gui.controllers.slider.IntegerSliderController +import net.minecraft.ChatFormatting +import net.minecraft.client.gui.screens.Screen +import net.minecraft.network.chat.Component + +object ConfigScreenBuilder { + @JvmStatic + fun create(parent: Screen): Screen { + val config = YetAnotherConfigLib.createBuilder() + .title(Component.literal("DynamicPack")) + .category(buildGeneralCategory()) + .category(buildNetworkCategory()) + .category(buildDebugCategory()) + .save { DynamicPackMod.config.save() } + .build() + + return YACLScreen(config, parent) + } + + private fun buildGeneralCategory(): ConfigCategory = + ConfigCategory.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.general")) + .group( + OptionGroup.createBuilder() + .option( + Option.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.general.isAutoUpdateAtLaunch")) + .binding( + Config.DEF.isAutoUpdateAtLaunch(), + { DynamicPackMod.config.isAutoUpdateAtLaunch() }, + { DynamicPackMod.config.setAutoUpdateAtLaunch(it) } + ) + .controller { BooleanControllerBuilder.create(it).yesNoFormatter() } + .build() + ) + .option( + Option.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.general.updateOnlyEnabledPacks")) + .binding( + Config.DEF.isUpdateOnlyEnabledPacks(), + { DynamicPackMod.config.isUpdateOnlyEnabledPacks() }, + { DynamicPackMod.config.setUpdateOnlyEnabledPacks(it) } + ) + .controller { BooleanControllerBuilder.create(it).yesNoFormatter() } + .build() + ) + .build() + ) + .build() + + private fun buildDebugCategory(): ConfigCategory = + ConfigCategory.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.debug")) + .tooltip(Component.translatable("dynamicpack.screen.config.category.debug.description").withStyle(ChatFormatting.RED)) + .group( + OptionGroup.createBuilder() + .name(Component.literal("Calculator's category ^_^")) + .option( + Option.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.debug.logAllFilesChanges")) + .binding( + Config.DEF.isLogAllFilesChanges(), + { DynamicPackMod.config.isLogAllFilesChanges() }, + { DynamicPackMod.config.setLogAllFilesChanges(it) } + ) + .controller(TickBoxControllerBuilder::create) + .build() + ) + .option( + Option.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.debug.ignoreHidden")) + .binding( + Config.DEF.dynamicRepoIsIgnoreHiddenContentFlag(), + { DynamicPackMod.config.dynamicRepoIsIgnoreHiddenContentFlag() }, + { DynamicPackMod.config.setDebugIgnoreHiddenFlagInContents(it) } + ) + .controller(TickBoxControllerBuilder::create) + .build() + ) + .option( + Option.createBuilder() + .name(Component.literal("INTERRUPT UPDATING")) + .description(OptionDescription.of(Component.literal("EXPERIMENTAL FUNCTIONAL"))) + .binding(object : Binding { + override fun setValue(value: Boolean) { + SyncingTask.currentRootSyncBuilder?.interrupt() + } + override fun getValue(): Boolean = false + override fun defaultValue(): Boolean = false + }) + .controller(TickBoxControllerBuilder::create) + .build() + ) + .build() + ) + .build() + + private fun buildNetworkCategory(): ConfigCategory = + ConfigCategory.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.network")) + .tooltip(Component.translatable("dynamicpack.screen.config.category.network.tooltip")) + .group( + OptionGroup.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.network.group.name")) + .description(OptionDescription.of(Component.translatable("dynamicpack.screen.config.category.network.group.description"))) + .option( + Option.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.network.bufferSize.name")) + .binding( + Config.DEF.getNetworkBufferSize(), + { DynamicPackMod.config.getNetworkBufferSize() }, + { DynamicPackMod.config.setNetworkBufferSize(it) } + ) + .controller { + IntegerSliderControllerBuilder.create(it) + .step(256) + .range(256, 8192) + } + .build() + ) + .option( + Option.createBuilder() + .name(Component.translatable("dynamicpack.screen.config.category.network.multithread.threads.name")) + .binding( + Config.DEF.getNetworkMultithreadDownloadThreads(), + { DynamicPackMod.config.getNetworkMultithreadDownloadThreads() }, + { DynamicPackMod.config.setNetworkMultithreadDownloadThreads(it) } + ) + .controller { integerOption -> + IntegerSliderControllerBuilder.create(integerOption) + .step(1) + .formatValue { value -> + when { + value >= 255 -> Component.literal("^_^ ") + .withStyle(ChatFormatting.STRIKETHROUGH, ChatFormatting.GOLD) + .append(Component.literal(value.toString()).withStyle(ChatFormatting.RESET, ChatFormatting.BOLD, ChatFormatting.GOLD)) + value > 80 -> Component.literal("X_X ") + .withStyle(ChatFormatting.DARK_RED) + .append(Component.literal(value.toString()).withStyle(ChatFormatting.BOLD, ChatFormatting.DARK_RED)) + value > 64 -> Component.literal("X_0 ") + .withStyle(ChatFormatting.DARK_RED) + .append(Component.literal(value.toString()).withStyle(ChatFormatting.BOLD)) + value > 32 -> Component.literal("0_0 ") + .withStyle(ChatFormatting.RED) + .append(Component.literal(value.toString()).withStyle(ChatFormatting.BOLD)) + value > 16 -> Component.literal("OwO ") + .withStyle(ChatFormatting.YELLOW) + .append(Component.literal(value.toString()).withStyle(ChatFormatting.BOLD)) + else -> IntegerSliderController.DEFAULT_FORMATTER.apply(value) + } + } + .range(1, 255) + } + .build() + ) + .build() + ) + .build() +} \ No newline at end of file diff --git a/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/NoYACLScreen.kt b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/NoYACLScreen.kt new file mode 100644 index 0000000..fd21425 --- /dev/null +++ b/src/main/kotlin/com/calculatorsteam/dynamicpack/client/config/NoYACLScreen.kt @@ -0,0 +1,108 @@ +package com.calculatorsteam.dynamicpack.client.config; + +import com.calculatorsteam.dynamicpack.platform.VersionFunctions +import net.minecraft.ChatFormatting +import net.minecraft.Util +import net.minecraft.client.gui.GuiGraphics +import net.minecraft.client.gui.components.Button +import net.minecraft.client.gui.screens.Screen +import net.minecraft.network.chat.ClickEvent +import net.minecraft.network.chat.CommonComponents +import net.minecraft.network.chat.Component +import net.minecraft.network.chat.Style +import net.minecraft.util.FormattedCharSequence +import net.minecraft.util.Mth +import java.net.URI + +/** + * Screen displayed if YACL (YetAnotherConfigLib) is not found. + */ +open class NoYACLScreen(private val parent: Screen) : Screen(Component.translatable("dynamicpack.screen.config.no_yacl.title")) { + + private val titleSequence: FormattedCharSequence = + Component.translatable("dynamicpack.screen.config.no_yacl.title") + .withStyle(ChatFormatting.BOLD) + .visualOrderText + + private val unwrappedText: Component = + Component.translatable( + "dynamicpack.screen.config.no_yacl.description", + Component.literal("YetAnotherConfigLib").withStyle { + it.withClickEvent(VersionFunctions.getClickEventOpenUrl("https://modrinth.com/mod/yacl")) + .applyFormats(ChatFormatting.BLUE, ChatFormatting.UNDERLINE) + }, + ) + + private lateinit var wrappedText: List + + override fun init() { + wrappedText = font.split(unwrappedText, width - 50) + + addRenderableWidget( + VersionFunctions.createButton