From 9166985d82afee4923aeace243fc5e620b7bb9d8 Mon Sep 17 00:00:00 2001 From: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:11:56 -0300 Subject: [PATCH] Clean up codebase, rename "Reset Settings" to "Apply Preset" --- .../ok_zoomer/commands/OkZoomerCommandScreen.java | 2 -- .../ennuil/ok_zoomer/config/OkZoomerConfig.java | 11 +++-------- .../ok_zoomer/config/OkZoomerConfigManager.java | 7 +++---- .../ok_zoomer/config/screen/OkZoomerConfigScreen.java | 4 ++-- .../ennuil/ok_zoomer/events/RegisterCommands.java | 1 - .../ennuil/ok_zoomer/mixin/MouseHandlerMixin.java | 1 - .../github/ennuil/ok_zoomer/packets/ZoomPackets.java | 1 - .../packets/payloads/ForceZoomDivisorPacket.java | 1 - .../io/github/ennuil/ok_zoomer/utils/ZoomUtils.java | 1 - src/main/resources/assets/ok_zoomer/lang/en_us.json | 4 ++-- src/main/resources/assets/ok_zoomer/lang/pt_br.json | 4 ++-- 11 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/main/java/io/github/ennuil/ok_zoomer/commands/OkZoomerCommandScreen.java b/src/main/java/io/github/ennuil/ok_zoomer/commands/OkZoomerCommandScreen.java index 93f2031..a0c1130 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/commands/OkZoomerCommandScreen.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/commands/OkZoomerCommandScreen.java @@ -4,13 +4,11 @@ import io.github.ennuil.ok_zoomer.config.screen.OkZoomerConfigScreen; import io.github.ennuil.ok_zoomer.config.screen.components.OkZoomerAbstractSelectionList; import io.github.ennuil.ok_zoomer.packets.ZoomPackets; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.util.CommonColors; public class OkZoomerCommandScreen extends Screen { private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); diff --git a/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfig.java b/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfig.java index 4879fe0..ec2b190 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfig.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfig.java @@ -1,18 +1,13 @@ package io.github.ennuil.ok_zoomer.config; +import io.github.ennuil.ok_zoomer.config.ConfigEnums.*; +import io.github.ennuil.ok_zoomer.config.metadata.WidgetSize; +import io.github.ennuil.ok_zoomer.config.metadata.WidgetSize.Size; import org.quiltmc.config.api.ReflectiveConfig; import org.quiltmc.config.api.annotations.*; import org.quiltmc.config.api.metadata.NamingSchemes; import org.quiltmc.config.api.values.TrackedValue; -import io.github.ennuil.ok_zoomer.config.ConfigEnums.CinematicCameraOptions; -import io.github.ennuil.ok_zoomer.config.ConfigEnums.SpyglassMode; -import io.github.ennuil.ok_zoomer.config.ConfigEnums.ZoomModes; -import io.github.ennuil.ok_zoomer.config.ConfigEnums.ZoomOverlays; -import io.github.ennuil.ok_zoomer.config.ConfigEnums.ZoomTransitionOptions; -import io.github.ennuil.ok_zoomer.config.metadata.WidgetSize; -import io.github.ennuil.ok_zoomer.config.metadata.WidgetSize.Size; - @SerializedNameConvention(NamingSchemes.SNAKE_CASE) public class OkZoomerConfig extends ReflectiveConfig { @Comment("Allows for configuring the main zoom features.") diff --git a/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfigManager.java b/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfigManager.java index 7960f0a..284e569 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfigManager.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/config/OkZoomerConfigManager.java @@ -45,10 +45,9 @@ public static void configureZoomInstance() { // Sets zoom overlay // TODO - Restore the "Use Spyglass Texture" option as a "Use Custom Texture" option // You won't do it without a nice placeholder texture though (that isn't Michael lmfao) - var overlayTextureId = ResourceLocation.parse( - CONFIG.features.zoomOverlay.value() == ConfigEnums.ZoomOverlays.SPYGLASS - ? "minecraft:textures/misc/spyglass_scope.png" - : "ok_zoomer:textures/misc/zoom_overlay.png"); + var overlayTextureId = CONFIG.features.zoomOverlay.value() == ConfigEnums.ZoomOverlays.SPYGLASS + ? ResourceLocation.withDefaultNamespace("textures/misc/spyglass_scope.png") + : ModUtils.id("textures/misc/zoom_overlay.png"); ZoomUtils.ZOOMER_ZOOM.setZoomOverlay( switch (CONFIG.features.zoomOverlay.value()) { diff --git a/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java b/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java index 00018b7..1d882ca 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java @@ -183,9 +183,9 @@ protected void init() { .create(0, 0, 150, 20, Component.translatable("config.ok_zoomer.presets.preset")); var resetButton = Button.builder( - Component.translatable("config.ok_zoomer.presets.reset_settings"), + Component.translatable("config.ok_zoomer.presets.apply_preset"), button -> this.resetToPreset(presetButton.getValue())) - .tooltip(Tooltip.create(Component.translatable("config.ok_zoomer.presets.reset_settings.tooltip"))) + .tooltip(Tooltip.create(Component.translatable("config.ok_zoomer.presets.apply_preset.tooltip"))) .build(); this.entryListWidget.addButton(presetButton, resetButton); diff --git a/src/main/java/io/github/ennuil/ok_zoomer/events/RegisterCommands.java b/src/main/java/io/github/ennuil/ok_zoomer/events/RegisterCommands.java index 9aa454e..4dbb54a 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/events/RegisterCommands.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/events/RegisterCommands.java @@ -1,7 +1,6 @@ package io.github.ennuil.ok_zoomer.events; import com.mojang.brigadier.CommandDispatcher; -import io.github.ennuil.ok_zoomer.OkZoomerClientMod; import io.github.ennuil.ok_zoomer.utils.ZoomUtils; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; diff --git a/src/main/java/io/github/ennuil/ok_zoomer/mixin/MouseHandlerMixin.java b/src/main/java/io/github/ennuil/ok_zoomer/mixin/MouseHandlerMixin.java index 300d4e8..2fe8177 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/mixin/MouseHandlerMixin.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/mixin/MouseHandlerMixin.java @@ -13,7 +13,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; // This mixin is responsible for the mouse-behavior-changing part of the zoom @ClientOnly diff --git a/src/main/java/io/github/ennuil/ok_zoomer/packets/ZoomPackets.java b/src/main/java/io/github/ennuil/ok_zoomer/packets/ZoomPackets.java index 02b1524..1191317 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/packets/ZoomPackets.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/packets/ZoomPackets.java @@ -15,7 +15,6 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; /* Manages the zoom packets and their signals. These packets are intended to be used by the future "Zoomer Boomer" server-side mod, diff --git a/src/main/java/io/github/ennuil/ok_zoomer/packets/payloads/ForceZoomDivisorPacket.java b/src/main/java/io/github/ennuil/ok_zoomer/packets/payloads/ForceZoomDivisorPacket.java index a4f4d1d..f2db418 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/packets/payloads/ForceZoomDivisorPacket.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/packets/payloads/ForceZoomDivisorPacket.java @@ -8,7 +8,6 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; import org.quiltmc.loader.api.minecraft.ClientOnly; public record ForceZoomDivisorPacket(double max, double min) implements CustomPacketPayload { diff --git a/src/main/java/io/github/ennuil/ok_zoomer/utils/ZoomUtils.java b/src/main/java/io/github/ennuil/ok_zoomer/utils/ZoomUtils.java index ca41ae5..9ca2542 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/utils/ZoomUtils.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/utils/ZoomUtils.java @@ -4,7 +4,6 @@ import io.github.ennuil.libzoomer.api.ZoomInstance; import io.github.ennuil.libzoomer.api.modifiers.ZoomDivisorMouseModifier; import io.github.ennuil.libzoomer.api.transitions.SmoothTransitionMode; -import io.github.ennuil.ok_zoomer.OkZoomerClientMod; import io.github.ennuil.ok_zoomer.config.OkZoomerConfigManager; import io.github.ennuil.ok_zoomer.key_binds.ZoomKeyBinds; import io.github.ennuil.ok_zoomer.packets.ZoomPackets; diff --git a/src/main/resources/assets/ok_zoomer/lang/en_us.json b/src/main/resources/assets/ok_zoomer/lang/en_us.json index 033707f..73341e6 100644 --- a/src/main/resources/assets/ok_zoomer/lang/en_us.json +++ b/src/main/resources/assets/ok_zoomer/lang/en_us.json @@ -89,8 +89,8 @@ "config.ok_zoomer.presets.preset.persistent.tooltip": "Reset to a preset configured with the Persistent zoom mode in mind.", "config.ok_zoomer.presets.preset.spyglass": "Spyglass", "config.ok_zoomer.presets.preset.spyglass.tooltip": "Reset to a preset that emulates the spyglass zoom.", - "config.ok_zoomer.presets.reset_settings": "Reset Settings", - "config.ok_zoomer.presets.reset_settings.tooltip": "Resets the settings to the selected preset.", + "config.ok_zoomer.presets.apply_preset": "Apply Preset", + "config.ok_zoomer.presets.apply_preset.tooltip": "Resets the settings to the selected preset.", "config.ok_zoomer.discard_changes": "Discard Changes", "command.ok_zoomer.title": "Control Panel", "command.ok_zoomer.config": "Mod Settings", diff --git a/src/main/resources/assets/ok_zoomer/lang/pt_br.json b/src/main/resources/assets/ok_zoomer/lang/pt_br.json index 406906e..e40bd1d 100644 --- a/src/main/resources/assets/ok_zoomer/lang/pt_br.json +++ b/src/main/resources/assets/ok_zoomer/lang/pt_br.json @@ -90,8 +90,8 @@ "config.ok_zoomer.presets.preset.persistent.tooltip": "Redefine para uma predefinição configurado com o modo de zoom Persistir em mente.", "config.ok_zoomer.presets.preset.spyglass": "Luneta", "config.ok_zoomer.presets.preset.spyglass.tooltip": "Redefine para uma predefinição que emula o zoom da luneta.", - "config.ok_zoomer.presets.reset_settings": "Redefinir definições", - "config.ok_zoomer.presets.reset_settings.tooltip": "Redefine as definições com a predefinição selecionada.", + "config.ok_zoomer.presets.apply_preset": "Aplicar predefinição", + "config.ok_zoomer.presets.apply_preset.tooltip": "Redefine as definições com a predefinição selecionada.", "config.ok_zoomer.discard_changes": "Descartar Mudanças", "command.ok_zoomer.title": "Painél de controle", "command.ok_zoomer.config": "Definições do mod",