Skip to content

Commit

Permalink
feat: update to 1.21.1 while keeping backwards compat
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Aug 16, 2024
1 parent 67ae12e commit f270eb2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v5
if: ${{ steps.get_release_type.outputs.result != 'test' }}
with:
branch: version/1.21
branch: version/1.21.1
commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
file_pattern: CHANGELOG.md
- name: Upload to Mod Platforms
Expand All @@ -96,7 +96,7 @@ jobs:
neoforge
game-versions: |
${{ steps.get_mc_version.outputs.result }}
1.21.1
1.21
changelog: |-
${{ steps.changelog.outputs.changes }}
Expand Down
15 changes: 5 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -154,26 +154,21 @@ dependencies {
// implementation "com.almostreliable.mods:almostunified-forge:${minecraft_version}-${almost_unified_version}"

//Geckolib
implementation "software.bernie.geckolib:geckolib-neoforge-${geckolib_minecraft_version}:${geckolib_version}"
implementation "software.bernie.geckolib:geckolib-neoforge-${minecraft_version_major}:${geckolib_version}"

//modonomicon
implementation "com.klikli_dev:modonomicon-${minecraft_version}-neoforge:${modonomicon_version}"

//occultism
compileOnly "com.klikli_dev:occultism-${minecraft_version}-neoforge:${occultism_version}"
runtimeOnly "com.klikli_dev:occultism-${minecraft_version}-neoforge:${occultism_version}"
compileOnly "com.klikli_dev:occultism-${minecraft_version_major}-neoforge:${occultism_version}"
runtimeOnly "com.klikli_dev:occultism-${minecraft_version_major}-neoforge:${occultism_version}"

//Jade (Hwyla/Waila)
implementation "maven.modrinth:jade:${jade_version}+neoforge"

//EMI
compileOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api"
runtimeOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"

//REI (if jei is not available, for convenience)
// runtimeOnly "maven.modrinth:rei:${rei_version}+neoforge"
// runtimeOnly "maven.modrinth:architectury-api:${architectury_version}+neoforge"
// runtimeOnly "maven.modrinth:cloth-config:${cloth_config_version}+neoforge"
compileOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version_major}:api"
runtimeOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version_major}"
}

processResources {
Expand Down
18 changes: 8 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ systemProp.net.minecraftforge.gradle.check.certs=false
## Environment Properties

# The Minecraft version must agree with the Forge version to get a valid artifact
minecraft_version=1.21
minecraft_version_major=1.21
minecraft_version=1.21.1
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.21,1.22)

## Neo
# The neo version must agree with the Minecraft version to get a valid artifact
neo_version=21.0.146
neo_version=21.1.13
# The neo version range can use any version of neo as bounds or match the loader version range
neo_version_range=[21.0.110-beta,)
# The loader version range can only use the major version of Neo/FML as bounds
Expand All @@ -39,21 +40,18 @@ mod_description=An open-source magic mod built around classical alchemy to repli

## Dependency Properties

jei_version=19.3.1.24
jei_version=19.8.5.118
jei_version_range=[19.3.1.0,)
modonomicon_version=1.95.1
modonomicon_version=1.99.0
modonomicon_version_range=[1.95.0,)
occultism_version=1.144.0
occultism_version_range=[1.144.0,)
almost_unified_version=0.5.0
almost_unified_version_range=[0.5.0,)
# geckolib currently names their files after 1.20
geckolib_minecraft_version=1.21
geckolib_version=4.5.5
geckolib_version=4.5.8
geckolib_version_range=[4.5.5,)
jade_version=15.1.3
jade_version=15.1.6
jade_version_range=[15.0.4,)
emi_version=1.1.10
rei_version=16.0.729
architectury_version=13.0.1
cloth_config_version=15.0.127
emi_version=1.1.12

0 comments on commit f270eb2

Please sign in to comment.