From 869c723b36afcd61982bd48366e2a4291e27ab4e Mon Sep 17 00:00:00 2001 From: "Pavel Erokhin (MairwunNx)" Date: Thu, 19 Mar 2020 00:13:37 +0300 Subject: [PATCH] Changes synced with 1.15.2 branch. Signed-off-by: Pavel Erokhin (MairwunNx) --- build.gradle | 54 ++++++++++++------- changelog.md | 12 +++++ gradle.properties | 12 ++--- readme.md | 2 +- .../projectessentials/backup/EntryPoint.kt | 2 +- src/main/resources/META-INF/mods.toml | 2 +- update.json | 7 +-- 7 files changed, 58 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index b770760..31f553d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,8 @@ apply(plugin: "net.minecraftforge.gradle") apply(plugin: "kotlin") apply(plugin: "kotlinx-serialization") +String packagesToken = new String(package_public_token.decodeBase64()) + version = module_version group = "com.mairwunnx.$module_id" archivesBaseName = module_name @@ -73,40 +75,52 @@ minecraft { repositories { jcenter() mavenCentral() - maven { url("https://minecraft.curseforge.com/api/maven/") } maven { url("https://libraries.minecraft.net") } maven { url("https://jitpack.io") } + maven { + name = "GitHubPackages" + url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-core" + credentials { + username = "MairwunNx@gmail.com" + password = packagesToken + } + } + maven { + name = "GitHubPackages" + url = uri "https://maven.pkg.github.com/projectessentials/projectessentials-permissions" + credentials { + username = "MairwunNx@gmail.com" + password = packagesToken + } + } + maven { + name = "GitHubPackages" + url = uri "https://maven.pkg.github.com/ProjectEssentials/ProjectEssentials-Cooldown" + credentials { + username = "MairwunNx@gmail.com" + password = packagesToken + } + } } dependencies { + implementation 'com.mairwunnx.project_essentials_core:ProjectEssentials-Core:1.14.4-1.3.0' + implementation 'com.mairwunnx.project_essentials_permissions:ProjectEssentials-Permissions:1.14.4-1.2.1' + implementation 'com.mairwunnx.project_essentials_cooldown:ProjectEssentials-Cooldown:1.14.4-1.0.4' + minecraft(group: "net.minecraftforge", name: "forge", version: forge_version) - compile(group: "com.mojang", name: "brigadier", version: brigadier_version) - compile( + implementation(group: "com.mojang", name: "brigadier", version: brigadier_version) + implementation( group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: kotlinx_serialization_version ) - compile( + implementation( group: "org.jetbrains.kotlin", name: "kotlin-stdlib-$kotlin_jdk_version_target", version: kotlin_version ) - compile( - group: "com.github.projectessentials", - name: "ProjectEssentials-Permissions", - version: ess_perm_version - ) - compile( - group: "com.github.projectessentials", - name: "ProjectEssentials-Core", - version: ess_core_version - ) - compile( - group: "com.github.projectessentials", - name: "ProjectEssentials-Cooldown", - version: ess_cooldown_version - ) - compile("org.zeroturnaround:zt-zip:$zt_zip_version") + implementation("org.zeroturnaround:zt-zip:$zt_zip_version") embed("org.zeroturnaround:zt-zip:$zt_zip_version") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_core_version") embed("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_core_version") diff --git a/changelog.md b/changelog.md index a11f116..d1e73fb 100644 --- a/changelog.md +++ b/changelog.md @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.14.4-1.0.2] - 2020-03-18 + +### Added +- Project Essentials dependencies added to `build.gradle`. + +### Changed +- Kotlin version updated to `1.3.70`. +- KotlinX serialization version updated to `0.20.0`. [Fixes crash on server startup] + +### Removed +- Essentials dependencies removed from `gradle.properties`. + ## [1.14.4-1.0.1] - 2020-01-28 ### Fixed diff --git a/gradle.properties b/gradle.properties index 85774b9..ec3a94d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,20 +5,18 @@ kotlin.code.style=official dev_run_client_path=run-client dev_run_server_path=run-server forge_gradle_version=3.+ -forge_version=1.14.4-28.1.114 +forge_version=1.14.4-28.2.0 forge_mappings_channel_type=snapshot forge_mappings_channel_version=20190719-1.14.3 brigadier_version=1.0.17 kotlin_jdk_version_target=jdk8 project_jvm_version_target=1.8 -kotlin_version=1.3.61 -kotlinx_serialization_version=0.14.0 +kotlin_version=1.3.70 +kotlinx_serialization_version=0.20.0 kotlinx_coroutines_core_version=1.3.3 zt_zip_version=1.13 -ess_core_version=v1.14.4-1.1.+ -ess_perm_version=v1.14.4-1.1.+ -ess_cooldown_version=v1.14.4-1.0.+ -module_version=1.14.4-1.0.1 +module_version=1.14.4-1.0.2 module_name=Project Essentials Backup module_id=project_essentials_backup module_vendor=MairwunNx (Pavel Erokhin) +package_public_token=ZDhjMjgyNjlhM2E0ZTQ0MmM2Mjk5ZWI4YmMyZjI0YzNjOTNkMDVkZA== diff --git a/readme.md b/readme.md index 56b116b..ad066e0 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ Lightweight additional module for Essentials. Just make server and client world ### Explore -#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Backup/releases/download/v1.14.4-1.0.1/Project.Essentials.Backup-1.14.4-1.0.1.jar) · [Configuration](https://mairwunnx.gitbook.io/project-essentials/project-essentials-backup#configuration) · [How to install](https://mairwunnx.gitbook.io/project-essentials/project-essentials-backup#how-to-install) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Backup/issues/new/choose) · [CurseForge](https://www.curseforge.com/minecraft/mc-mods/ProjectEssentials-Backup) · [Change log](changelog.md) +#### [Download mod](https://github.com/ProjectEssentials/ProjectEssentials-Backup/releases/download/v1.14.4-1.0.2/Project.Essentials.Backup-1.14.4-1.0.2.jar) · [Configuration](https://mairwunnx.gitbook.io/project-essentials/project-essentials-backup#configuration) · [How to install](https://mairwunnx.gitbook.io/project-essentials/project-essentials-backup#how-to-install) · [Troubleshooting](https://github.com/ProjectEssentials/ProjectEssentials-Backup/issues/new/choose) · [CurseForge](https://www.curseforge.com/minecraft/mc-mods/ProjectEssentials-Backup) · [Change log](changelog.md) ### Compatibility diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/backup/EntryPoint.kt b/src/main/kotlin/com/mairwunnx/projectessentials/backup/EntryPoint.kt index 2bda2dd..26aff5a 100644 --- a/src/main/kotlin/com/mairwunnx/projectessentials/backup/EntryPoint.kt +++ b/src/main/kotlin/com/mairwunnx/projectessentials/backup/EntryPoint.kt @@ -16,7 +16,7 @@ class EntryPoint : EssBase() { private val logger = LogManager.getLogger() init { - modVersion = "1.14.4-1.0.1" + modVersion = "1.14.4-1.0.2" logBaseInfo() validateForgeVersion() MinecraftForge.EVENT_BUS.register(this) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c61647f..1f717f6 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Backup/i [[mods]] modId="project_essentials_backup" - version="1.14.4-1.0.1" + version="1.14.4-1.0.2" displayName="Project Essentials Backup" updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Backup/MC-1.14.4/update.json" displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Backup" diff --git a/update.json b/update.json index 63002fa..4279831 100644 --- a/update.json +++ b/update.json @@ -1,11 +1,12 @@ { - "homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Backup/releases/tag/v1.14.4-1.0.1", + "homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Backup", "1.14.4": { + "1.14.4-1.0.2": " - Changelog for 1.14.4-1.0.2 https://github.com/ProjectEssentials/ProjectEssentials-Backup/blob/MC-1.14.4/changelog.md#1144-102---2020-03-18", "1.14.4-1.0.1": " - Changelog for 1.14.4-1.0.1 https://github.com/ProjectEssentials/ProjectEssentials-Backup/blob/MC-1.14.4/changelog.md#1144-101---2020-01-28", "1.14.4-1.0.0": " - Changelog for 1.14.4-1.0.0 https://github.com/ProjectEssentials/ProjectEssentials-Backup/blob/MC-1.14.4/changelog.md#1144-100---2020-01-26" }, "promos": { - "1.14.4-latest": "1.14.4-1.0.1", - "1.14.4-recommended": "1.14.4-1.0.1" + "1.14.4-latest": "1.14.4-1.0.2", + "1.14.4-recommended": "1.14.4-1.0.2" } }