From efb799efbf30732dfbf2a07be403614c47379436 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Sat, 4 May 2024 16:49:56 +0100 Subject: [PATCH 1/2] Switch to Fabric Mixin --- build_shared.gradle | 3 +++ settings.gradle | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build_shared.gradle b/build_shared.gradle index 203f723fb01..7f2bca4bf22 100644 --- a/build_shared.gradle +++ b/build_shared.gradle @@ -13,6 +13,9 @@ repositories { maven gradleutils.forgeMaven maven gradleutils.minecraftLibsMaven //mavenLocal() + maven { // temporary measure until Fabric Mixin is mirrored on Forge's maven + url = 'https://maven.fabricmc.net/' + } } tasks.withType(Javadoc).configureEach { diff --git a/settings.gradle b/settings.gradle index 04dd62a3144..5449ef36c5c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,7 +36,7 @@ dependencyResolutionManagement { library('typetools', 'net.jodah:typetools:0.6.3') // Needed by EventBus because of lambdas library('mergetool-api', 'net.minecraftforge:mergetool-api:1.0') - library('mixin', 'org.spongepowered:mixin:0.8.5') + library('mixin', 'net.fabricmc:sponge-mixin:0.13.4+mixin.0.8.5') library('nulls', 'org.jetbrains:annotations:24.1.0') // Got to have our null annotations! library('slf4j-api', 'org.slf4j:slf4j-api:2.0.7') library('maven-artifact', 'org.apache.maven:maven-artifact:3.8.5') From 703ae252507ab47b142eb9f27ac8a287ae72442c Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Thu, 9 May 2024 22:05:30 +0100 Subject: [PATCH 2/2] Switch to Forge's fork of Fabric Mixin --- build_shared.gradle | 3 --- settings.gradle | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build_shared.gradle b/build_shared.gradle index 7f2bca4bf22..203f723fb01 100644 --- a/build_shared.gradle +++ b/build_shared.gradle @@ -13,9 +13,6 @@ repositories { maven gradleutils.forgeMaven maven gradleutils.minecraftLibsMaven //mavenLocal() - maven { // temporary measure until Fabric Mixin is mirrored on Forge's maven - url = 'https://maven.fabricmc.net/' - } } tasks.withType(Javadoc).configureEach { diff --git a/settings.gradle b/settings.gradle index 5449ef36c5c..a27c99b774d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,7 +36,7 @@ dependencyResolutionManagement { library('typetools', 'net.jodah:typetools:0.6.3') // Needed by EventBus because of lambdas library('mergetool-api', 'net.minecraftforge:mergetool-api:1.0') - library('mixin', 'net.fabricmc:sponge-mixin:0.13.4+mixin.0.8.5') + library('mixin', 'net.minecraftforge:mixins:0.8.5-fabric.0.13.4-forge.0.0.1') library('nulls', 'org.jetbrains:annotations:24.1.0') // Got to have our null annotations! library('slf4j-api', 'org.slf4j:slf4j-api:2.0.7') library('maven-artifact', 'org.apache.maven:maven-artifact:3.8.5')