Fixed neoforge and updated some dependencies

This commit is contained in:
coolGi
2024-01-09 19:12:26 +10:30
parent d2ad35ad05
commit 841e5ba492
5 changed files with 14 additions and 11 deletions
+8 -3
View File
@@ -152,10 +152,16 @@ subprojects { p ->
shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
compileClasspath.extendsFrom common
runtimeClasspath.extendsFrom common
developmentForge.extendsFrom common
if (findProject(":forge"))
developmentForge.extendsFrom common
if (findProject(":neoforged"))
developmentNeoForge.extendsFrom common
compileClasspath.extendsFrom coreProjects
runtimeClasspath.extendsFrom coreProjects
developmentForge.extendsFrom coreProjects
if (findProject(":forge"))
developmentForge.extendsFrom coreProjects
if (findProject(":neoforged"))
developmentNeoForge.extendsFrom coreProjects
if (findProject(":fabricLike") && p != project(":fabricLike")) {
// Shadow fabricLike
@@ -163,7 +169,6 @@ subprojects { p ->
shadowFabricLike
compileClasspath.extendsFrom fabricLike
runtimeClasspath.extendsFrom fabricLike
developmentForge.extendsFrom fabricLike
}
}
}
+2 -2
View File
@@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
mod_discord=https://discord.gg/xAB8G4cENx
# Global Plugin Versions
manifold_version=2023.1.31
manifold_version=2024.1.0
nightconfig_version=3.6.6
lz4_version=1.8.0
sqlite_jdbc_version=3.43.0.0
@@ -44,7 +44,7 @@ versionStr=
# This defines what MC version Intellij will use for the preprocessor
# and what version is used automatically by build and run commands
mcVer=1.20.2
mcVer=1.20.4
# Defines the maximum amount of memory Minecraft is allowed when run in a developement environment
#minecraftMemoryJavaArg="-Xmx4G"
+1 -3
View File
@@ -8,7 +8,7 @@ sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
architectury {
platformSetupLoomIde()
forge()
neoForge()
}
repositories {
@@ -41,8 +41,6 @@ loom {
// ]
}
mixin {
useLegacyMixinAp = true
// Mixins are now defined in the `mods.toml`
// mixinConfigs = [
// "DistantHorizons.mixins.json"
+2 -2
View File
@@ -37,8 +37,8 @@ fabric_api_version=0.91.2+1.20.4
enable_canvas=0
# (Neo)Forge loader
forge_version=49.0.3
neoforged_version=20.4.49-beta
forge_version=49.0.16
neoforged_version=20.4.83-beta
# (Neo)Forge mod versions
starlight_version_forge=
terraforged_version=