diff --git a/build.gradle b/build.gradle index c40ece76..d049240e 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ repositories { dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - annotationProcessor 'org.spongepowered:mixin:0.8.4:processor' + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' implementation "li.cil.sedna:sedna-${minecraft_version}-forge:1.0.12" @@ -125,11 +125,10 @@ minecraft { } mixin { - add sourceSets.main, "oc2.refmap.json" + add sourceSets.main, 'mixins.oc2.refmap.json' + config 'mixins.oc2.json' - config 'oc2.mixins.json' - - quiet +// quiet } task copyGeneratedResources(type: Copy) { @@ -151,7 +150,7 @@ jar { 'Implementation-Version' : "${semver}", 'Implementation-Vendor' : 'Sangar', 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'MixinConfigs' : 'oc2.mixins.json', + 'MixinConfigs' : 'mixins.oc2.json', ]) } } diff --git a/src/main/resources/oc2.mixins.json b/src/main/resources/mixins.oc2.json similarity index 90% rename from src/main/resources/oc2.mixins.json rename to src/main/resources/mixins.oc2.json index fbfdb3d7..79f30cc7 100644 --- a/src/main/resources/oc2.mixins.json +++ b/src/main/resources/mixins.oc2.json @@ -3,7 +3,7 @@ "compatibilityLevel": "JAVA_17", "required": true, "package": "li.cil.oc2.common.mixin", - "refmap": "oc2.refmap.json", + "refmap": "mixins.oc2.refmap.json", "mixins": [ "ChunkAccessMixin", "ChunkMapMixin"