fix build issues

IMB11 · Oct 20, 2024 · f05631d · f05631d
1 parent bc7e8e5
commit f05631d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/src/main/java/dev/imb11/fog/client/util/FogKeybinds.java b/src/main/java/dev/imb11/fog/client/util/FogKeybinds.java
@@ -1,27 +1,27 @@
 package dev.imb11.fog.client.util;
 
-import dev.imb11.fog.client.command.FogClientCommands;
+import dev.architectury.event.events.client.ClientTickEvent;
+import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
 import dev.imb11.fog.config.FogConfig;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.option.StickyKeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import org.lwjgl.glfw.GLFW;
 
 public class FogKeybinds {
-	public static KeyBinding toggleKeybind = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-	    "key.fog.toggle",
-		InputUtil.UNKNOWN_KEY.getCode(),
-	    "key.categories.misc"
-	));
+	public static KeyBinding toggleKeybind;
 
 	public static void init() {
-		ClientTickEvents.END_CLIENT_TICK.register(client -> {
+
+		toggleKeybind = new KeyBinding(
+				"key.fog.toggle",
+				InputUtil.UNKNOWN_KEY.getCode(),
+				"key.categories.misc"
+		);
+
+		KeyMappingRegistry.register(toggleKeybind);
+
+		ClientTickEvent.CLIENT_POST.register(client -> {
 			while (toggleKeybind.wasPressed()) {
 				FogConfig config = FogConfig.getInstance();
 				config.disableMod = !config.disableMod;

diff --git a/src/main/java/dev/imb11/fog/client/util/math/DarknessCalculation.java b/src/main/java/dev/imb11/fog/client/util/math/DarknessCalculation.java
@@ -33,7 +33,7 @@ public record DarknessCalculation(float fogStart, float fogEnd, float darknessVa
 				float factor = client.options.getDarknessEffectScale().getValue().floatValue();
 
 				/*? if <1.20.6 {*/
-				/*float intensity = effect.getFactorCalculationData().get().lerp(e, deltaTick) * factor;
+				/*float intensity = effect.getFactorCalculationData().get().lerp(livingEntity, deltaTick) * factor;
 				 *//*?} else {*/
 				float intensity = effect.getFadeFactor(livingEntity, deltaTick) * factor;
 				/*?}*/

diff --git a/src/main/java/dev/imb11/fog/loaders/neoforge/FogClientNeoForge.java b/src/main/java/dev/imb11/fog/loaders/neoforge/FogClientNeoForge.java
@@ -12,17 +12,17 @@ public FogClientNeoForge() {
 		FogClient.initialize();
 
 		/^? if =1.20.4 {^/
-		/^ModLoadingContext.get().registerExtensionPoint(
+		ModLoadingContext.get().registerExtensionPoint(
 				net.neoforged.neoforge.client.ConfigScreenHandler.ConfigScreenFactory.class,
 				() -> new net.neoforged.neoforge.client.ConfigScreenHandler.ConfigScreenFactory(
 						(client, parent) -> FogConfig.getInstance().getYetAnotherConfigLibInstance().generateScreen(parent)
 				)
         );
-        ^//^?} else {^/
-		ModLoadingContext.get().getActiveContainer().registerExtensionPoint(
+        /^?} else {^/
+		/^ModLoadingContext.get().getActiveContainer().registerExtensionPoint(
 				net.neoforged.neoforge.client.gui.IConfigScreenFactory.class, (client, parent) -> FogConfig.getInstance().getYetAnotherConfigLibInstance().generateScreen(parent)
 		);
-		/^?}^/
+		^//^?}^/
 	}
 }
 *//*?}*/
diff --git a/src/main/java/dev/imb11/fog/mixin/client/rendering/WorldRendererMixin.java b/src/main/java/dev/imb11/fog/mixin/client/rendering/WorldRendererMixin.java
@@ -20,16 +20,16 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-
-/*? if >=1.20.6 {*/
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArgs;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
+
+/*? if >=1.20.6 {*/
 import net.minecraft.util.math.Vec3d;
 /*?} else {*/
 /*import net.minecraft.client.util.math.MatrixStack;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.joml.Matrix4f;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 *//*?}*/
 
 @Mixin(value = WorldRenderer.class)