From e59b741045b8c590c1999dd5fd6102e8113b8efb Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 12 Nov 2024 20:38:40 -0500 Subject: [PATCH] Mining the errors away' post merge fixes --- .../main/java/dev/engine_room/flywheel/impl/FlwCommands.java | 4 ++-- .../java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java | 1 - gradle.properties | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java index 1966f29a4..5e260b9ff 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java @@ -84,7 +84,7 @@ public final class FlwCommands { return Command.SINGLE_SUCCESS; }))); - var lightSmoothnessValue = ForgeFlwConfig.INSTANCE.client.backendConfig.lightSmoothness; + var lightSmoothnessValue = NeoForgeFlwConfig.INSTANCE.client.backendConfig.lightSmoothness; command.then(Commands.literal("lightSmoothness") .then(Commands.argument("mode", LightSmoothnessArgument.INSTANCE) .executes(context -> { @@ -98,7 +98,7 @@ public final class FlwCommands { return Command.SINGLE_SUCCESS; }))); - var useLightDirectionsValue = ForgeFlwConfig.INSTANCE.client.backendConfig.useLightDirections; + var useLightDirectionsValue = NeoForgeFlwConfig.INSTANCE.client.backendConfig.useLightDirections; command.then(Commands.literal("useLightDirections") .executes(context -> { if (useLightDirectionsValue.get()) { diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java index 151af23b0..f754fc992 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java @@ -1,7 +1,6 @@ package dev.engine_room.flywheel.impl; import dev.engine_room.flywheel.api.event.ReloadLevelRendererEvent; -import dev.engine_room.flywheel.impl.compat.CompatMod; import net.minecraft.client.multiplayer.ClientLevel; import net.neoforged.fml.loading.LoadingModList; import net.neoforged.neoforge.common.NeoForge; diff --git a/gradle.properties b/gradle.properties index 373956c9d..f343ff5c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,8 +31,8 @@ fabric_loader_version = 0.16.5 fabric_api_version = 0.105.0+1.21.1 # Build dependency mod versions -sodium_version = mc1.21-0.6.0-beta.2 -iris_version = 1.8.0-beta.1+1.21 +sodium_version = mc1.21.1-0.6.0-beta.4 +iris_version = 1.8.0-beta.8+1.21.1 # Publication info group = dev.engine_room.flywheel