diff --git a/build.gradle b/build.gradle index 378e8923..6b151350 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { dependencies { classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0' if (fabric) { - classpath 'fabric-loom:fabric-loom.gradle.plugin:0.8-SNAPSHOT' + classpath 'fabric-loom:fabric-loom.gradle.plugin:0.10-SNAPSHOT' } else if (mcVersion >= 11400) { classpath('net.minecraftforge.gradle:ForgeGradle:5.0.5') { // the FG people still haven't learned to not do breaking changes exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one @@ -124,8 +124,8 @@ group= "com.replaymod" archivesBaseName = "replaymod" if (FABRIC) { - minecraft { - refmapName = 'mixins.replaymod.refmap.json' + loom { + mixin.defaultRefmapName.set('mixins.replaymod.refmap.json') runConfigs.all { ideConfigGenerated = true } @@ -334,7 +334,7 @@ dependencies { shadow "com.github.ReplayMod:ReplayStudio:c9de2f5", shadeExclusions - implementation(jGui){ + implementation(FABRIC ? dependencies.project(path: jGui.path, configuration: "namedElements") : jGui) { transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those } shadow 'com.github.ReplayMod:lwjgl-utils:27dcd66' diff --git a/jGui b/jGui index 31bcfabe..8b28d1ce 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 31bcfabe67a5b2de490e0f5c53c1a59e636497be +Subproject commit 8b28d1ce0c8152a1ba8a4db8f5f3ea8f80e7cde8 diff --git a/root.gradle.kts b/root.gradle.kts index 870e71bc..8847c31c 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -2,8 +2,8 @@ import groovy.json.JsonOutput import java.io.ByteArrayOutputStream plugins { - id("fabric-loom") version "0.8-SNAPSHOT" apply false - id("com.replaymod.preprocess") version "123fb7a" + id("fabric-loom") version "0.10-SNAPSHOT" apply false + id("com.replaymod.preprocess") version "7746c47" id("com.github.hierynomus.license") version "0.15.0" }