From 467051589b37e4c5292f0dc65e6d23d8126aa1fa Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 Feb 2023 16:16:03 +0000 Subject: [PATCH] Replace the two settings.gradle files to have a more sensible starter package layout. (#143) --- .github/workflows/release-packages.yml | 2 ++ README.md | 2 +- docs/FAQ.md | 4 ---- settings.gradle | 4 ++-- settings.gradle.example | 28 -------------------------- 5 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 settings.gradle.example diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 185937e..e66a04e 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -39,6 +39,7 @@ jobs: -x "LICENSE" \ -x "gtnhShared/*" \ \ + -x "packages/" \ -x "packages/starter.zip" \ -x "packages/migration.zip" @@ -60,6 +61,7 @@ jobs: -x "README.md" \ -x "gtnhShared/*" \ \ + -x "packages/" \ -x "packages/starter.zip" \ -x "packages/migration.zip" diff --git a/README.md b/README.md index 18bf2d5..3368724 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Creating mod from scratch: 2. Replace placeholders in LICENSE-template and rename it to LICENSE, or remove LICENSE-template and put any other license you like on your code. This is an permissive OSS project and we encourage you participate in OSS movement by having permissive license like one in template. You can find out pros and cons of OSS software in [this article](https://www.freecodecamp.org/news/what-is-great-about-developing-open-source-and-what-is-not/) 3. Ensure your project is under VCS. For example initialise git repository by running `git init; git commit --message "initialized repository"`. 4. Replace placeholders (edit values in gradle.properties, change example package and class names, etc.) -5. Run `./gradlew setupDecompWorkspace` (if build fails with `Could not find :forgeBin:1.7.10-10.13.4.1614-1.7.10.` this should fix it) +5. Run `./gradlew build` 6. Make sure to check out the rest sections of this file. 7. You are good to go! diff --git a/docs/FAQ.md b/docs/FAQ.md index d5c950d..ea8362d 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -7,7 +7,3 @@ You may or may not run into this popup. For now, the only solution is to point t ![](http://i.imgur.com/gzBMLrr.png) Solution: Point it to `~/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/unpacked/conf`. On Windows, please use `%USERPROFILE%/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.4.1614-1.7.10/unpacked/conf`. - -### Could not find :forgeBin:1.7.10-10.13.4.1614-1.7.10 - -Run the gradle task `setupDecompWorkspace`. \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 8f6f74c..01ea5f1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,6 +23,6 @@ plugins { blowdryerSetup { repoSubfolder 'gtnhShared' - //github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0') - devLocal '.' // Use this when testing config updates locally + github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0') + //devLocal '.' // Use this when testing config updates locally } diff --git a/settings.gradle.example b/settings.gradle.example deleted file mode 100644 index 01ea5f1..0000000 --- a/settings.gradle.example +++ /dev/null @@ -1,28 +0,0 @@ - -pluginManagement { - repositories { - maven { - // RetroFuturaGradle - name "GTNH Maven" - url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true - mavenContent { - includeGroup("com.gtnewhorizons.retrofuturagradle") - } - } - gradlePluginPortal() - mavenCentral() - mavenLocal() - } -} - -plugins { - id 'com.diffplug.blowdryerSetup' version '1.6.0' - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains -} - -blowdryerSetup { - repoSubfolder 'gtnhShared' - github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0') - //devLocal '.' // Use this when testing config updates locally -}