Skip to content

Commit

Permalink
Merge pull request #84 from RakSrinaNa/feature/forge
Browse files Browse the repository at this point in the history
Support Forge 1.18.2
  • Loading branch information
Rakambda committed Mar 13, 2022
2 parents 5b47d0a + 4d4dfc6 commit a1ec47c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: gradle/gradle-build-action@v2.1.3
env:
ORG_GRADLE_PROJECT_version: "${{ steps.get_release.outputs.name }}"
ORG_GRADLE_PROJECT_changelog: "[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})"
ORG_GRADLE_PROJECT_changelog: "[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})\n\n${{ steps.get_release.outputs.body }}"
ORG_GRADLE_PROJECT_forgeKeyStore: keystoreForgeMods.jks
ORG_GRADLE_PROJECT_forgeKeyStoreAlias: ${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}
ORG_GRADLE_PROJECT_forgeKeyStorePass: ${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}
Expand All @@ -55,7 +55,7 @@ jobs:
uses: gradle/gradle-build-action@v2.1.3
env:
ORG_GRADLE_PROJECT_version: "${{ steps.get_release.outputs.name }}"
ORG_GRADLE_PROJECT_changelog: "[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})"
ORG_GRADLE_PROJECT_changelog: "[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})\n\n${{ steps.get_release.outputs.body }}"
ORG_GRADLE_PROJECT_curseforgeApiKey: ${{ secrets.CURSEFORGE_API_KEY }}
ORG_GRADLE_PROJECT_modrinthToken: ${{ secrets.MODRINTH_TOKEN }}
ORG_GRADLE_PROJECT_forgeKeyStore: keystoreForgeMods.jks
Expand Down
8 changes: 4 additions & 4 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
modLoader="javafml"
loaderVersion="[39,)"
loaderVersion="[40,)"
issueTrackerURL="https://github.com/${repoUser}/${repoName}/issues"
license = "LGPL-3.0"

[[mods]] #mandatory
modId="${modId}"
version="${version}"
displayName="${modName}"
updateJSONURL="https://raw.githubusercontent.com/${repoUser}/${repoName}/${minecraft_version}-forge/update.json"
updateJSONURL="https://raw.githubusercontent.com/${repoUser}/${repoName}/${minecraftVersion}-forge/update.json"
description='''Changes Mending behaviour to repair what is in your inventory and need it the most. No need to have it equipped anymore.'''
displayURL="https://www.curseforge.com/minecraft/mc-mods/overpowered-mending"
logoFile="logo.png"
Expand All @@ -16,12 +16,12 @@ authors="RakSrinaNa"
[[dependencies.overpoweredmending]]
modId="forge"
mandatory=true
versionRange="[39,)"
versionRange="[40,)"
ordering="NONE"
side="BOTH"
[[dependencies.overpoweredmending]]
modId="minecraft"
mandatory=true
versionRange="[${minecraft_version}]"
versionRange="[${minecraftVersion}]"
ordering="NONE"
side="BOTH"
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ modId=overpoweredmending
modName=OverpoweredMending
version=0.0.1-dev
includeFabric=true
includeForge=false
includeForge=true
# Repository
repoUser=RakSrinaNa
repoName=OverpoweredMending
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ jetbrains-annotations-version = "23.0.0"
log4j2-version = "2.17.1"
minecraftVersion = "1.18.2"
fabric-loader-version = "0.13.3"
fabric-api-version = "0.47.8+1.18.2"
forge-version = "1.18.1-39.0.0"
modmenu-version = "3.0.1"
fabric-api-version = "0.47.10+1.18.2"
forge-version = "1.18.2-40.0.13"
modmenu-version = "3.1.0"

fabric-loom-version = "0.11.29"
fabric-loom-version = "0.12.1"
forge-plugin-version = "5.1.27"
curse-version = "1.4.0"
modrinth-version = "1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit a1ec47c

Please sign in to comment.