From b56a8b0cad805eeeb822f33ac44e61de817dfcf0 Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Tue, 15 Apr 2025 15:48:10 +0200 Subject: [PATCH] Finish actually updating to 1.21.2 Signed-off-by: Username404-59 --- .../kotlin/fr/username404/snowygui/config/ConfigScreen.kt | 4 ++-- .../main/kotlin/fr/username404/snowygui/gui/feature/Zoom.kt | 4 ++-- .../main/java/fr/username404/snowygui/mixins/ZoomMixin.java | 2 +- .../main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt b/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt index 53ebff1..14dab21 100644 --- a/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt +++ b/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt @@ -49,9 +49,9 @@ val SnowyConfigScreen: Screen = object: Screen(translationComponent) { startBooleanToggle(translatable("$confPrefix.behavior.sortalphabetically"), sortAlphabetically) .setDefaultValue(true).requireRestart() .setSaveConsumer { sortAlphabetically = it }.build(), - startDoubleField(translatable("$confPrefix.behavior.zoom.factor"), Zoom.zoomFactor).setSaveConsumer { + startFloatField(translatable("$confPrefix.behavior.zoom.factor"), Zoom.zoomFactor).setSaveConsumer { Zoom.zoomFactor = it - }.setMin(1.1).build(), + }.setMin(1.1F).build(), startBooleanToggle(translatable("$confPrefix.behavior.zoom.smoothcamera"), Zoom.smoothCameraOnZoom).setSaveConsumer { Zoom.smoothCameraOnZoom = it Zoom.execAction() diff --git a/common/src/main/kotlin/fr/username404/snowygui/gui/feature/Zoom.kt b/common/src/main/kotlin/fr/username404/snowygui/gui/feature/Zoom.kt index b69ce72..bdecd4e 100644 --- a/common/src/main/kotlin/fr/username404/snowygui/gui/feature/Zoom.kt +++ b/common/src/main/kotlin/fr/username404/snowygui/gui/feature/Zoom.kt @@ -6,9 +6,9 @@ import net.minecraft.client.Minecraft @ButtonInfo(Category.MISC, shouldSave = false) object Zoom: ButtonImpl() { var smoothCameraOnZoom: Boolean by Configuration - var zoomFactor: Double by Configuration + var zoomFactor: Float by Configuration @JvmStatic - fun getNewZoom(fov: Double): Double = fov / zoomFactor + fun getNewZoom(fov: Float): Float = fov / zoomFactor public override fun execAction() { Minecraft.getInstance().options.smoothCamera = toggled && smoothCameraOnZoom } diff --git a/fabric/src/main/java/fr/username404/snowygui/mixins/ZoomMixin.java b/fabric/src/main/java/fr/username404/snowygui/mixins/ZoomMixin.java index 9bed4fe..7197831 100644 --- a/fabric/src/main/java/fr/username404/snowygui/mixins/ZoomMixin.java +++ b/fabric/src/main/java/fr/username404/snowygui/mixins/ZoomMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(GameRenderer.class) abstract class ZoomMixin { @Inject(at = @At(value = "RETURN"), method = "getFov(Lnet/minecraft/client/Camera;FZ)F", cancellable = true) - private void getFov(Camera camera, float f, boolean bl, CallbackInfoReturnable cir) { + private void getFov(Camera camera, float f, boolean bl, CallbackInfoReturnable cir) { if (Zoom.INSTANCE.getToggled() && !OkZoomerCompatKt.isOkZoomerPresent) { cir.setReturnValue(Zoom.getNewZoom(cir.getReturnValue())); } diff --git a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt index 3b86d90..51328e3 100644 --- a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt +++ b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt @@ -7,6 +7,6 @@ import net.neoforged.neoforge.client.event.ComputeFovModifierEvent object ZoomHandler { @SubscribeEvent fun onFOVEvent(event: ComputeFovModifierEvent) { - if (Zoom.toggled) event.newFovModifier = Zoom.getNewZoom(event.newFovModifier.toDouble()).toFloat() + if (Zoom.toggled) event.newFovModifier = Zoom.getNewZoom(event.newFovModifier) } } \ No newline at end of file