Skip to content

Commit

Permalink
Merge pull request #22 from Erdragh/feature/multiloader-template
Browse files Browse the repository at this point in the history
NeoForge and Multiloader Template
  • Loading branch information
Erdragh authored May 27, 2024
2 parents 0d8664d + 51334cd commit 9b7edb8
Show file tree
Hide file tree
Showing 27 changed files with 504 additions and 347 deletions.
28 changes: 11 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ jobs:
with:
name: build-fabric
path: fabric/build/libs
- name: Capture Forge Artifacts
- name: Capture Neo Artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v4
with:
name: build-forge
path: forge/build/libs
name: build-neo
path: neoforge/build/libs
- name: Capture Changelog
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v4
Expand All @@ -78,11 +78,11 @@ jobs:
path: build/fabric
pattern: build-fabric
merge-multiple: true
- name: Download Forge artifacts
- name: Download Neo artifacts
uses: actions/download-artifact@v4
with:
path: build/forge
pattern: build-forge
path: build/neo
pattern: build-neo
merge-multiple: true
- name: Download Changelog
uses: actions/download-artifact@v4
Expand All @@ -102,9 +102,9 @@ jobs:
path: "./gradle.properties"
properties: "version enabledPlatforms minecraftVersion"

- name: Upload Forge Releases (Curse/Modrinth)
id: forge_release
if: contains(steps.properties.outputs.enabledPlatforms, 'forge')
- name: Upload Neo Releases (Curse/Modrinth)
id: neo_release
if: contains(steps.properties.outputs.enabledPlatforms, 'neoforge')
uses: Kir-Antipov/[email protected]
with:
curseforge-id: ${{ vars.CURSE_ID }}
Expand All @@ -114,19 +114,17 @@ jobs:
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

files: ./build/forge/!(*-@(dev|sources|dev-shadow)).jar
name: "AstralBot ${{ steps.properties.outputs.version }} Forge ${{ steps.properties.output.minecraftVersion }}"
name: "AstralBot ${{ steps.properties.outputs.version }} NeoForge ${{ steps.properties.output.minecraftVersion }}"
version: ${{ steps.properties.outputs.version }}
version-type: release
changelog-file: build-changelog/prepared_changelog.md
loaders: forge
game-versions: ${{ steps.properties.outputs.minecraftVersion }}

curseforge-dependencies: |
sqlite-jdbc(optional)
kotlin-for-forge(required)
forge-config-api-port-fabric(required)
modrinth-dependencies: |
sqlite-jdbc(optional)
kotlin-for-forge(required)
forge-config-api-port(required)
Expand All @@ -153,11 +151,7 @@ jobs:
fabric-api(required)
fabric-language-kotlin(required)
forge-config-api-port-fabric(required)
sqlite-jdbc(optional)
ledger(optional)
modrinth-dependencies: |
fabric-api(required)
fabric-language-kotlin(required)
forge-config-api-port(required)
sqlite-jdbc(optional)
ledger(optional)
forge-config-api-port(required)
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.4.0
- Port to 1.20.4 and NeoForge
- Removed Forge as a supported Platform for Minecraft > 1.20.1
- JiJ SQLite and Commonmark dependencies, allowing better compatibility and removing the SQLite JDBC dependency

# 1.3.0
- Message Embeds to better represent Minecraft messages on Discord
- Fix `/link` Minecraft command not being registered on Forge
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ to see how much is already implemented.

This mod has a few dependencies, some of which are not specified directly as they're technically optional:
- The Kotlin Implementation for the platform you're running. (e.g. [Kotlin For Forge](https://modrinth.com/mod/kotlin-for-forge) or [Fabric Language Kotlin](https://modrinth.com/mod/fabric-language-kotlin))
- The Forge Config API (Included in Forge, [extra mod for Fabric](https://modrinth.com/mod/forge-config-api-port))
- The SQLite Database Driver. (This is included in [Ledger](https://modrinth.com/mod/ledger) but also [available separately](https://modrinth.com/plugin/sqlite-jdbc))
- The (Neo-)Forge Config API (Included in NeoForge, [extra mod for Fabric](https://modrinth.com/mod/forge-config-api-port))

## Implementation
- [JDA](https://jda.wiki) library to communicate with the Discord API.
Expand Down
Loading

0 comments on commit 9b7edb8

Please sign in to comment.