Skip to content

Commit

Permalink
Update MRAPI to 1.15.0 and ME to 0.2.0-beta.10
Browse files Browse the repository at this point in the history
  • Loading branch information
thecatcore committed Aug 21, 2023
1 parent cc2c29b commit ac95874
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ allprojects {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modApi("maven.modrinth:mod-remapping-api:${project.mod_remapping_api}")
// modApi(group: "local", name: "mod-remapping-api", version: "1.8.0")

modApi("maven.modrinth:spasm:${project.spasm_version}")
modApi(annotationProcessor("com.github.LlamaLad7.MixinExtras:mixinextras-fabric:${project.mixin_extras_version}"))
implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}"))

implementation(group: "local", name: "argo", version: "2.25")
implementation(group: "local", name: "guava", version: "12.0.1")
Expand All @@ -69,9 +68,14 @@ allprojects {

processResources {
inputs.property "version", project.version
inputs.property "mc_version", project.minecraft_version
inputs.property "mrapi_version", project.mod_remapping_api

filesMatching("fabric.mod.json") {
expand "version": project.version
expand "version": project.version,
"mc_version": rootProject.minecraft_version,
"mrapi_version": project.mod_remapping_api
// expand "mc_version": rootProject.minecraft_version
}
}

Expand Down Expand Up @@ -107,8 +111,6 @@ loom {
dependencies {
include(group: "local", name: "argo", version: "2.25")
include(group: "local", name: "guava", version: "12.0.1")

include("org.apache.commons:commons-lang3:3.12.0")
}

subprojects {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ org.gradle.jvmargs=-Xmx2G
loader_version = 0.14.22

# Legacy Fabric API
mod_remapping_api = 1.14.2
mod_remapping_api = 1.15.0
forge_version = 4.3.5.318
mixin_extras_version=0.2.0-beta.8
spasm_version=0.1.2
mixin_extras_version=0.2.0-beta.10
spasm_version=0.2

# Mod Properties
mod_version = 2.6.0
mod_version = 2.6.1
maven_group = fr.catcore
archives_base_name = fabricated-forge
4 changes: 1 addition & 3 deletions mod-compat/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
"mixins": [
],
"depends": {
"fabricloader": ">0.14.3",
"minecraft": "1.3.2",
"mod-remapping-api": ">=1.14.2"
"fabricloader": ">0.14.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public RelaunchClassLoader() {
public void registerTransformer(String transformerClassName) {
try {
IClassTransformer classTransformer = (IClassTransformer) Class.forName(transformerClassName).newInstance();
ClassTransformer.registerTransformer(classTransformer);
ClassTransformer.registerPostTransformer(classTransformer);
System.out.println("Registered ClassTransformer: " + transformerClassName);
this.transformers.add(classTransformer);
} catch (Exception var3) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
],
"depends": {
"fabricloader": ">0.14.3",
"minecraft": "1.3.2",
"mod-remapping-api": ">=1.14.2"
"minecraft": "${mc_version}",
"mod-remapping-api": ">=${mrapi_version}"
},
"custom": {
"loom:injected_interfaces": {
Expand Down

0 comments on commit ac95874

Please sign in to comment.