From 0a4ad265dd7006762a014ebd48ea8a987a4e5a0b Mon Sep 17 00:00:00 2001 From: RoootTheFox Date: Tue, 14 Jun 2022 21:41:12 +0200 Subject: [PATCH 1/5] config: toggleable zoom --- .../java/net/foxes4life/foxclient/config/ConfigData.java | 1 + src/main/java/net/foxes4life/foxclient/util/ZoomUtils.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/foxes4life/foxclient/config/ConfigData.java b/src/main/java/net/foxes4life/foxclient/config/ConfigData.java index 9c87fb3..98a1aec 100644 --- a/src/main/java/net/foxes4life/foxclient/config/ConfigData.java +++ b/src/main/java/net/foxes4life/foxclient/config/ConfigData.java @@ -18,6 +18,7 @@ public ConfigData() { Category misc = new Category("Miscellaneous"); misc.addSetting("discord-rpc", new CategoryEntry<>(true, "Discord RPC")); misc.addSetting("discord-rpc-show-ip", new CategoryEntry<>(true, "RPC: Show Server IP")); + misc.addSetting("smooth-zoom", new CategoryEntry<>(true, "Smooth Zoom")); Category debug = new Category("Debug"); debug.addSetting("boolean-uwu", new CategoryEntry<>(true, "Boolean Test")); diff --git a/src/main/java/net/foxes4life/foxclient/util/ZoomUtils.java b/src/main/java/net/foxes4life/foxclient/util/ZoomUtils.java index d39bc11..3fdb786 100644 --- a/src/main/java/net/foxes4life/foxclient/util/ZoomUtils.java +++ b/src/main/java/net/foxes4life/foxclient/util/ZoomUtils.java @@ -1,6 +1,7 @@ package net.foxes4life.foxclient.util; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.foxes4life.foxclient.Main; import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.KeyBinding; import net.minecraft.util.math.MathHelper; @@ -38,6 +39,8 @@ public static void smoothCam () { } public static void calculateZoom(CallbackInfoReturnable cir) { - ZoomUtils.actualZoomLevel = MathHelper.lerp(0.05f, ZoomUtils.actualZoomLevel, ZoomUtils.currentZoomLevel); + ZoomUtils.actualZoomLevel = Main.config_instance.getBoolean("misc", "smooth-zoom") ? + MathHelper.lerp(0.05f, ZoomUtils.actualZoomLevel, ZoomUtils.currentZoomLevel) : + ZoomUtils.currentZoomLevel; } } From 3185c5aa89c776deb7f1f7190a66ce49c886018e Mon Sep 17 00:00:00 2001 From: flux / floofball <65369281+Flustix@users.noreply.github.com> Date: Fri, 17 Jun 2022 20:45:44 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7723b6e..4a469ea 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,7 @@ TODO: add a list of features ### Can I use this on a Vanilla server? Yeah sure. FoxClient is 100% client side and doesn't require anything to be installed on the server. -###### Copyright (C) 2022 FoxStudios \ No newline at end of file +### Is there gonna be a forge version? +NO + +###### Copyright (C) 2022 FoxStudios From 40e12f7dfc1bf8b1ba40dd076f97b63698cb8e56 Mon Sep 17 00:00:00 2001 From: flux / floofball <65369281+Flustix@users.noreply.github.com> Date: Fri, 17 Jun 2022 20:52:32 +0200 Subject: [PATCH 3/5] add a small thing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a469ea..f105e6e 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,6 @@ TODO: add a list of features Yeah sure. FoxClient is 100% client side and doesn't require anything to be installed on the server. ### Is there gonna be a forge version? -NO +NO [here's why](https://v.foxes4life.net/trol.png) ###### Copyright (C) 2022 FoxStudios From 53e8f1e5fd3d52d122423d89e05143e98fb31e06 Mon Sep 17 00:00:00 2001 From: flux / floofball <65369281+Flustix@users.noreply.github.com> Date: Sat, 9 Jul 2022 12:56:43 +0200 Subject: [PATCH 4/5] temporarily remove license --- LICENSE | 1 - 1 file changed, 1 deletion(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d7121c8..0000000 --- a/LICENSE +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2021-2022 FoxStudios \ No newline at end of file From b18473edae92ea2b752cd513a1eeced9a8ca826d Mon Sep 17 00:00:00 2001 From: flux / floofball <65369281+Flustix@users.noreply.github.com> Date: Sat, 9 Jul 2022 12:57:19 +0200 Subject: [PATCH 5/5] readd license again --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0b72c32 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 FoxStudios + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.