R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.16' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-08-13 16:12:32 -04:00
commit 3492f9a4ee
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
6 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -94,6 +94,7 @@ allprojects {
maven { maven {
url 'https://maven.terraformersmc.com/releases' url 'https://maven.terraformersmc.com/releases'
} }
maven { url = "https://jitpack.io" }
} }
} }

1
common/build.gradle
View File

@ -10,6 +10,7 @@ dependencies {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
// Do NOT use other classes from fabric loader // Do NOT use other classes from fabric loader
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}") { modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}") {
transitive = false transitive = false

1
fabric/build.gradle
View File

@ -31,6 +31,7 @@ configurations {
dependencies { dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}" testImplementation "net.fabricmc:fabric-loader-junit:${rootProject.fabric_loader_version}"
include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${rootProject.mixinextras_version}")))
modCompileOnly(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } modCompileOnly(fabricApi.module("fabric-api-base", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }
modCompileOnly(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' } modCompileOnly(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) { exclude group: 'net.fabricmc', module: 'fabric-loader' }

2
forge/build.gradle
View File

@ -45,6 +45,8 @@ repositories {
dependencies { dependencies {
forge "net.minecraftforge:forge:${rootProject.forge_version}" forge "net.minecraftforge:forge:${rootProject.forge_version}"
implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}"))
implementation(include("com.github.llamalad7.mixinextras:mixinextras-forge:${rootProject.mixinextras_version}"))
// Remove the next line if you don't want to depend on the API // Remove the next line if you don't want to depend on the API
// modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}" // modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}"

2
forge/src/main/resources/META-INF/mods.toml
View File

@ -40,7 +40,7 @@ modId = "forge" #mandatory
# Does this dependency have to exist - if not, ordering below must be specified # Does this dependency have to exist - if not, ordering below must be specified
mandatory = true #mandatory mandatory = true #mandatory
# The version range of the dependency # The version range of the dependency
versionRange = "[40,)" #mandatory versionRange = "[40.2.4,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering = "NONE" ordering = "NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER # Side this dependency is applied on - BOTH, CLIENT or SERVER

3
gradle.properties
View File

@ -2,11 +2,12 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
junit_version=5.10.0-M1 junit_version=5.10.0-M1
mixinextras_version=0.2.0-beta.9
mod_id=modernfix mod_id=modernfix
minecraft_version=1.18.2 minecraft_version=1.18.2
enabled_platforms=fabric,forge enabled_platforms=fabric,forge
forge_version=1.18.2-40.2.1 forge_version=1.18.2-40.2.4
lazydfu_version=3544496 lazydfu_version=3544496
parchment_version=2022.11.06 parchment_version=2022.11.06
refined_storage_version=4392829 refined_storage_version=4392829