Skip to content

Commit

Permalink
Clean up codebase, rename "Reset Settings" to "Apply Preset"
Browse files Browse the repository at this point in the history
  • Loading branch information
EnnuiL committed Jun 18, 2024
1 parent 0f8b338 commit 9166985
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/ok_zoomer/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/ok_zoomer/lang/pt_br.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 9166985

Please sign in to comment.