-
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* update to minecraft 1.20.2 * bump cursegradle version * add NeoForge support * fix build and add name of loader in each file * bugfix: upstream changes to blitSprite would cause icons to render under their frame, and colors to blend with the icon Signed-off-by: MeeniMc <[email protected]> * move to architectury loom, this also includes moving some packages around * upload correct files to CF and Modrinth * temporary remove additional files from CF upload and add changelog to modrinth * update gradle/loom for 1.20.4 Signed-off-by: MeeniMc <[email protected]> * NeoForge for 1.20.4 does not accept 'mandatory' keyword anymore Signed-off-by: MeeniMc <[email protected]> * 1.20.4 java changes: displayInfo.getFrame is now getType, getBackground now returns an Optional Signed-off-by: MeeniMc <[email protected]> * update some versions * Create build.yml * Update build.yml * Update build.yml * move to GitHub Actions for building * add support for multi line changelog messages * bump some versions * Making the icon compatible with Mod Menu (#162) * Update fabric.mod.json * Add files via upload * Create better-advancements * Added an Icon to make it work with Mod Menu --------- Co-authored-by: Fate <[email protected]> * Added ability to translate criteria (#165) * Added ability to translate criteria * Bumped version to 0.4.2 * Fixed criterion not using the correct colors and formatting. (#166) * bump versions for development, prep for next MC version * update to minecraft 1.20.6 * Backported to 1.20.1 --------- Signed-off-by: MeeniMc <[email protected]> Co-authored-by: way2muchnoise <[email protected]> Co-authored-by: MeeniMc <[email protected]> Co-authored-by: Fate (F5T3) <[email protected]> Co-authored-by: Fate <[email protected]>
- Loading branch information
5 people
committed
Jun 21, 2024
1 parent
f36a1e4
commit be0bf2e
Showing
91 changed files
with
1,177 additions
and
718 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| name: 'Build' | ||
|
|
||
| on: | ||
| push: | ||
|
|
||
| env: | ||
| MODRINTH_TOKEN: ${{ secrets.PUBLISH_MODRINTH_TOKEN }} | ||
| CURSE_KEY: ${{ secrets.PUBLISH_CURSEFORGE_TOKEN }} | ||
|
|
||
| permissions: | ||
| contents: write | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| # Setup | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Create changelog | ||
| run: | | ||
| { | ||
| echo 'CHANGELOG<<EOF' | ||
| git log ${{ github.event.before }}...${{ github.event.after }} --pretty=format:"\[[%h](https://github.com/$GITHUB_REPOSITORY/commit/%H)\] %s (%cn) " | ||
| echo "" | ||
| echo EOF | ||
| } >> "$GITHUB_ENV" | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'microsoft' | ||
| java-version: '17' | ||
| cache: 'gradle' | ||
| - name: Make Gradle Wrapper Executable | ||
| if: ${{ runner.os != 'Windows' }} | ||
| run: chmod +x ./gradlew | ||
| # Build | ||
| - name: Build with Gradle | ||
| run: ./gradlew clean build | ||
| # Publish | ||
| - name: Publish CurseForge | ||
| run: ./gradlew :Forge:publishCurseForge :Fabric:publishCurseForge :NeoForge:publishCurseForge | ||
| - name: Publish Modrinth | ||
| run: ./gradlew :Forge:modrinth :Fabric:modrinth :NeoForge:modrinth | ||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| if-no-files-found: error | ||
| path: output/*[^shadow].jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,14 @@ | ||
| plugins { | ||
| java | ||
| id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT" | ||
| } | ||
|
|
||
| // gradle.properties | ||
| val minecraftVersion: String by extra | ||
|
|
||
| val dependencyProjects: List<Project> = listOf( | ||
| project(":CommonApi"), | ||
| ) | ||
|
|
||
| dependencyProjects.forEach { | ||
| project.evaluationDependsOn(it.path) | ||
| } | ||
|
|
||
| minecraft { | ||
| version(minecraftVersion) | ||
| // no runs are configured for Common | ||
| accessWideners(file("src/main/resources/betteradvancements.accesswidener")) | ||
| } | ||
|
|
||
| sourceSets { | ||
| val platforms: String by extra | ||
|
|
||
| architectury { | ||
| common(platforms.split(",")) | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| loom { | ||
| accessWidenerPath.set(file("src/main/resources/betteradvancements.accesswidener")) | ||
| } | ||
|
|
||
| dependencies { | ||
| compileOnly( | ||
| group = "org.spongepowered", | ||
| name = "mixin", | ||
| version = "0.8.5" | ||
| ) | ||
| dependencyProjects.forEach { | ||
| implementation(it) | ||
| } | ||
| api(project(":CommonApi", configuration = "namedElements")) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...vancements/BetterDisplayInfoRegistry.java → ...vancements/BetterDisplayInfoRegistry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...cements/gui/BetterAdvancementTabType.java → .../common/gui/BetterAdvancementTabType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.