Skip to content

Commit

Permalink
use forge temporarily
Browse files Browse the repository at this point in the history
  • Loading branch information
dphaldes committed Sep 1, 2023
1 parent cf64231 commit 2078bd7
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [1.0.1] - Unreleased

### Changed

- Switched back to Forge and use older version of Ars till NeoForge is ready.

## [1.0.0] - 2023-08-29

Port to 1.20.x and build for NeoForge.
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle' version '[6.0.18,6.2)'
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
// id 'net.neoforged.gradle' version '[6.0.18,6.2)'
id 'org.spongepowered.mixin' version '0.7.+'
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
}
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.

version = "${mc_version}-${mod_version}"
version = mod_version
group = mod_group_id

base {
archivesName = mod_id
archivesName = mod_id + "-" + mc_version
}

java.toolchain.languageVersion = JavaLanguageVersion.of(17)
Expand Down Expand Up @@ -122,7 +123,8 @@ repositories {
jarJar.enable()

dependencies {
minecraft "net.neoforged:forge:${mc_version}-${forge_version}"
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
// minecraft "net.neoforged:forge:${mc_version}-${forge_version}"

implementation fg.deobf("com.hollingsworth.ars_nouveau:ars_nouveau-${mc_version}:${ars_version}")
// implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${mc_version}:${gecko_version}")
Expand Down
8 changes: 5 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
#
mod_version=1.0.0
mod_version=1.0.1
mod_id=ars_ocultas
mod_authors=mystchonky
mod_group_id=com.mystchonky.ars_ocultas
mc_version=1.20.1
forge_version=47.1.70
forge_version=47.1.3
#forge_version=47.1.70
#
registrate_version=MC1.20-1.3.3
jei_version=15.2.0.25
curio_version=5.2.0-beta.3+1.20.1
patchouli_version=81-FORGE
#
ars_version=4.3.0.0.65
ars_version=4.2.5.63
#ars_version=4.3.0.0.65
terrablender=3.0.0.165
gecko_version=4.2.1
#
Expand Down
11 changes: 9 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
pluginManagement {
repositories {
// maven {
// name = 'MinecraftForge'
// url = 'https://maven.neoforged.net/releases'
// }
maven {
name = 'MinecraftForge'
url = 'https://maven.neoforged.net/releases'
url = 'https://maven.minecraftforge.net/'
content {
includeGroup "net.minecraftforge.gradle"
includeGroup "net.minecraftforge"
}
}

maven {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ side = "BOTH"
[[dependencies.ars_ocultas]]
modId = "ars_nouveau"
mandatory = true
versionRange = "[4.3.0,)"
versionRange = "[4.2.0,)"
ordering = "AFTER"
side = "BOTH"

Expand Down

0 comments on commit 2078bd7

Please sign in to comment.