From 994cb313faf64f6eda7f722b7eb5c977d592d564 Mon Sep 17 00:00:00 2001 From: Barrett Ray Date: Sat, 17 Jun 2023 21:02:37 -0500 Subject: [PATCH 1/2] chore: Upgrade to 1.20.1 Manually edited all mentions of "1.20" to "1.20.1" and upgraded dependencies as necessary. It'd probably be a good idea to get some global variables going for the game, Forge, and Fabric version(s) - just in case it becomes more necessary. :) --- Fabric/build.gradle | 4 ++-- Fabric/src/main/resources/fabric.mod.json | 4 ++-- Forge/build.gradle | 4 ++-- Forge/src/main/resources/META-INF/mods.toml | 6 +++--- Jenkinsfile | 4 ++-- gradle.properties | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index e3d54ea..71a07b8 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -147,8 +147,8 @@ publisher { versionType = "release" changelog = rootProject.file("changelog-fabric.md") version = "${minecraft_version}-${project.version}" - displayName = "[FABRIC/QUILT 1.20] CraterLib - ${project.version}" - gameVersions = ["1.20"] + displayName = "[FABRIC/QUILT 1.20.1] CraterLib - ${project.version}" + gameVersions = ["1.20.1"] loaders = ["fabric", "quilt"] artifact = remapJar diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index e102407..4f2d3e4 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ "depends": { "fabricloader": ">=0.14.21", "fabric-api": "*", - "minecraft": ">=1.20", + "minecraft": ">=1.20.1", "java": ">=17" } -} +} \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle index dea6b5f..b6bef24 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -175,8 +175,8 @@ publisher { versionType = "release" changelog = rootProject.file("changelog-forge.md") version = "${minecraft_version}-${project.version}" - displayName = "[FORGE 1.20] CraterLib - ${project.version}" - gameVersions = ["1.20"] + displayName = "[FORGE 1.20.1] CraterLib - ${project.version}" + gameVersions = ["1.20.1"] loaders = ["forge"] artifact = jar } diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index d69f990..1a77c4b 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[46,)" +loaderVersion = "[47,)" license = "MIT" issueTrackerURL="https://github.com/firstdarkdev/craterLib/issues" @@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION" [[dependencies.craterlib]] modId = "forge" mandatory = true -versionRange = "[46,)" +versionRange = "[47,)" ordering = "NONE" side = "BOTH" [[dependencies.craterlib]] modId = "minecraft" mandatory = true -versionRange = "[1.20,1.20.1)" +versionRange = "[1.20.1]" ordering = "NONE" side = "BOTH" diff --git a/Jenkinsfile b/Jenkinsfile index 8eba93d..faafcc4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stage("Notify Discord") { steps { discordSend webhookURL: env.FDD_WH_ADMIN, - title: "Deploy Started: CraterLib 1.20 Deploy #${BUILD_NUMBER}", + title: "Deploy Started: CraterLib 1.20.1 Deploy #${BUILD_NUMBER}", link: env.BUILD_URL, result: 'SUCCESS', description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" @@ -35,7 +35,7 @@ pipeline { deleteDir() discordSend webhookURL: env.FDD_WH_ADMIN, - title: "CraterLib 1.20 Deploy #${BUILD_NUMBER}", + title: "CraterLib 1.20.1 Deploy #${BUILD_NUMBER}", link: env.BUILD_URL, result: currentBuild.currentResult, description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}" diff --git a/gradle.properties b/gradle.properties index 2e4feca..093ed92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,17 +5,17 @@ version_patch=0 group=me.hypherionmc.craterlib # Common -minecraft_version=1.20 +minecraft_version=1.20.1 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server # Forge -forge_version=46.0.1 +forge_version=47.0.3 forge_ats_enabled=true # Fabric -fabric_version=0.83.0+1.20 +fabric_version=0.83.1+1.20.1 fabric_loader_version=0.14.21 # Mod options @@ -28,7 +28,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Dependencies -mod_menu_version=7.0.0-beta.2 +mod_menu_version=7.1.0 moon_config=1.0.9 # Publishing -- 2.49.1 From 54ad8e4969bdbf6f611ed7e73681a851b799fd80 Mon Sep 17 00:00:00 2001 From: Barrett Ray Date: Sat, 17 Jun 2023 21:09:26 -0500 Subject: [PATCH 2/2] chore: Updated README with build instructions Feel free to exclude this one, but I hope these help someone out! :) --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 094137c..81f232f 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,16 @@ A library mod used by HypherionSA and First Dark Development mods to make portin ## Setup Instructions -** Wiki Coming Soon ** - +There's a **wiki coming soon**, but for now, here's some basic instructions for building the project: +1. `git clone` the project to a safe spot. +2. Install Java's JDK 17. Make sure you have the development version explicitly: + * Fedora: `sudo dnf install java-17-openjdk-devel` + * Ubuntu: `sudo apt install openjdk-17-jdk` + * macOS: `brew install openjdk@17` +3. Set it accordingly: + * Windows/macOS: Set the `JAVA_HOME` environment variable or use system settings + * Linux: `sudo update-alternatives --config java` +4. Navigate to the CraterLib folder, then run a `gradlew` file depending on your operating system: + * Windows: `.\gradlew.bat build` + * macOS/Linux/BSD: `chmod +x gradlew` and `./gradlew` -- 2.49.1