From 8146d775a1026283cfa73581bc829932173d34f1 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 28 Jun 2021 22:52:43 +0300 Subject: [PATCH] net.fabricmc.loom.inject -> dev.architectury.loom.forgeruntime --- .../architectury/loom/forgeruntime}/YarnNamingService.java | 2 +- .../mixin/ForgeLoomMixinRemapperInjectorService.java | 2 +- .../loom/forgeruntime}/mixin/MixinIntermediaryDevRemapper.java | 2 +- .../services/cpw.mods.modlauncher.api.INameMappingService | 2 +- .../services/cpw.mods.modlauncher.api.ITransformationService | 2 +- .../fabricmc/loom/configuration/providers/LaunchProvider.java | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) rename forge-runtime/src/main/java/{net/fabricmc/loom/inject => dev/architectury/loom/forgeruntime}/YarnNamingService.java (98%) rename forge-runtime/src/main/java/{net/fabricmc/loom/inject => dev/architectury/loom/forgeruntime}/mixin/ForgeLoomMixinRemapperInjectorService.java (98%) rename forge-runtime/src/main/java/{net/fabricmc/loom/inject => dev/architectury/loom/forgeruntime}/mixin/MixinIntermediaryDevRemapper.java (99%) diff --git a/forge-runtime/src/main/java/net/fabricmc/loom/inject/YarnNamingService.java b/forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/YarnNamingService.java similarity index 98% rename from forge-runtime/src/main/java/net/fabricmc/loom/inject/YarnNamingService.java rename to forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/YarnNamingService.java index dea0428f..9d3c2aa9 100644 --- a/forge-runtime/src/main/java/net/fabricmc/loom/inject/YarnNamingService.java +++ b/forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/YarnNamingService.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.inject; +package dev.architectury.loom.forgeruntime; import java.io.BufferedReader; import java.io.IOException; diff --git a/forge-runtime/src/main/java/net/fabricmc/loom/inject/mixin/ForgeLoomMixinRemapperInjectorService.java b/forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/mixin/ForgeLoomMixinRemapperInjectorService.java similarity index 98% rename from forge-runtime/src/main/java/net/fabricmc/loom/inject/mixin/ForgeLoomMixinRemapperInjectorService.java rename to forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/mixin/ForgeLoomMixinRemapperInjectorService.java index 1fe961c6..c32f6724 100644 --- a/forge-runtime/src/main/java/net/fabricmc/loom/inject/mixin/ForgeLoomMixinRemapperInjectorService.java +++ b/forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/mixin/ForgeLoomMixinRemapperInjectorService.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.inject.mixin; +package dev.architectury.loom.forgeruntime.mixin; import java.io.BufferedReader; import java.nio.file.Files; diff --git a/forge-runtime/src/main/java/net/fabricmc/loom/inject/mixin/MixinIntermediaryDevRemapper.java b/forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/mixin/MixinIntermediaryDevRemapper.java similarity index 99% rename from forge-runtime/src/main/java/net/fabricmc/loom/inject/mixin/MixinIntermediaryDevRemapper.java rename to forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/mixin/MixinIntermediaryDevRemapper.java index ef5724dc..f331a9ca 100644 --- a/forge-runtime/src/main/java/net/fabricmc/loom/inject/mixin/MixinIntermediaryDevRemapper.java +++ b/forge-runtime/src/main/java/dev/architectury/loom/forgeruntime/mixin/MixinIntermediaryDevRemapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.fabricmc.loom.inject.mixin; +package dev.architectury.loom.forgeruntime.mixin; import java.util.ArrayDeque; import java.util.Collection; diff --git a/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.INameMappingService b/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.INameMappingService index 45290566..ec41d220 100644 --- a/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.INameMappingService +++ b/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.INameMappingService @@ -1 +1 @@ -net.fabricmc.loom.inject.YarnNamingService +dev.architectury.loom.forgeruntime.YarnNamingService diff --git a/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService b/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService index 0fb04144..679794d7 100644 --- a/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService +++ b/forge-runtime/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService @@ -1 +1 @@ -net.fabricmc.loom.inject.mixin.ForgeLoomMixinRemapperInjectorService \ No newline at end of file +dev.architectury.loom.forgeruntime.mixin.ForgeLoomMixinRemapperInjectorService \ No newline at end of file diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index 4cf96b94..6325162c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -72,6 +72,7 @@ public class LaunchProvider extends DependencyProvider { if (getExtension().isForge()) { launchConfig + // Should match YarnNamingService.PATH_TO_MAPPINGS in forge-runtime .property("fabric.yarnWithSrg.path", getExtension().getMappingsProvider().tinyMappingsWithSrg.toAbsolutePath().toString()) .argument("--fml.mcVersion")