From 7a9849bfcfbd301a9f09cf8ba46ed82b959bad48 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Fri, 30 Jun 2023 15:53:10 +0300 Subject: [PATCH] Fix ClassCastExceptions --- .../fabricmc/loom/configuration/CompileConfiguration.java | 2 +- .../providers/minecraft/MinecraftJarConfiguration.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 87eb363a..eea545d4 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -240,7 +240,7 @@ public abstract class CompileConfiguration implements Runnable { namedMinecraftProvider.provide(provideContext); if (extension.isForge()) { - final SrgMinecraftProvider srgMinecraftProvider = jarConfiguration.getSrgMinecraftProviderBiFunction().apply(configContext, minecraftProvider); + final SrgMinecraftProvider srgMinecraftProvider = jarConfiguration.getSrgMinecraftProviderBiFunction().apply(project, minecraftProvider); extension.setSrgMinecraftProvider(srgMinecraftProvider); srgMinecraftProvider.provide(provideContext); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java index 44209449..47370df7 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java @@ -83,7 +83,7 @@ public enum MinecraftJarConfiguration { private final Function minecraftProviderFunction; private final BiFunction> intermediaryMinecraftProviderBiFunction; private final BiFunction> namedMinecraftProviderBiFunction; - private final BiFunction> srgMinecraftProviderBiFunction; + private final BiFunction> srgMinecraftProviderBiFunction; private final BiFunction, MinecraftJarProcessorManager, ProcessedNamedMinecraftProvider> processedNamedMinecraftProviderBiFunction; private final BiFunction> decompileConfigurationBiFunction; private final List supportedEnvironments; @@ -101,7 +101,7 @@ public enum MinecraftJarConfiguration { this.minecraftProviderFunction = (Function) minecraftProviderFunction; this.intermediaryMinecraftProviderBiFunction = (BiFunction>) (Object) intermediaryMinecraftProviderBiFunction; this.namedMinecraftProviderBiFunction = (BiFunction>) namedMinecraftProviderBiFunction; - this.srgMinecraftProviderBiFunction = (BiFunction>) (Object) srgMinecraftProviderBiFunction; + this.srgMinecraftProviderBiFunction = (BiFunction>) (Object) srgMinecraftProviderBiFunction; this.processedNamedMinecraftProviderBiFunction = (BiFunction, MinecraftJarProcessorManager, ProcessedNamedMinecraftProvider>) (Object) processedNamedMinecraftProviderBiFunction; this.decompileConfigurationBiFunction = (BiFunction>) decompileConfigurationBiFunction; this.supportedEnvironments = supportedEnvironments; @@ -127,7 +127,7 @@ public enum MinecraftJarConfiguration { return decompileConfigurationBiFunction; } - public BiFunction> getSrgMinecraftProviderBiFunction() { + public BiFunction> getSrgMinecraftProviderBiFunction() { return srgMinecraftProviderBiFunction; }