Skip to content

Rework Settings system #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Exterminate5573 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rework Settings system #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb75eda
Rework Settings system
Exterminate5573 Jul 27, 2026
314b128
Resolve some issues
Exterminate5573 Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 4 additions & 25 deletions common/src/main/java/io/github/kurrycat/mpkmod/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
import io.github.kurrycat.mpkmod.gui.screens.LandingBlockGuiScreen;
import io.github.kurrycat.mpkmod.gui.screens.main_gui.LabelConfiguration;
import io.github.kurrycat.mpkmod.gui.screens.main_gui.MainGuiScreen;
import io.github.kurrycat.mpkmod.gui.screens.options_gui.Option;
import io.github.kurrycat.mpkmod.gui.screens.options_gui.OptionsGuiScreen;
import io.github.kurrycat.mpkmod.landingblock.LandingBlock;
import io.github.kurrycat.mpkmod.modules.MPKModule;
import io.github.kurrycat.mpkmod.modules.ModuleManager;
import io.github.kurrycat.mpkmod.settings.Settings;
import io.github.kurrycat.mpkmod.ticks.TimingStorage;
import io.github.kurrycat.mpkmod.util.BoundingBox3D;
import io.github.kurrycat.mpkmod.util.ItrUtil;
Expand All @@ -35,27 +35,6 @@ public class Main implements MPKModule {
public static MainGuiScreen mainGUI;
public static InfoTree infoTree;

@Option.Field(
category = "labels",
displayName = "Display Overlay",
description = "Whether to show all the components on the overlay while playing"
)
public static boolean displayOverlay = true;

@Option.Field(
category = "landingblocks",
displayName = "Highlight Landing Blocks",
description = "Whether to highlight all enabled landing blocks"
)
public static boolean highlightLandingBlocks = true;

@Option.Field(
category = "debug",
displayName = "Copy Position Shortcut",
description = "Whether to override the vanilla F3+C shortcut to copy your precise position"
)
public static boolean copyPositionShortcutEnabled = true;

@Override
public void init() {
infoTree = InfoString.createInfoTree();
Expand Down Expand Up @@ -112,7 +91,7 @@ public void loaded() {
ModuleManager.reloadAllModules();
}
} else if (event.keyCode == InputConstants.KEY_C) {
if (!copyPositionShortcutEnabled) return;
if (!Settings.copyPositionShortcutEnabled.getValue()) return;

if (Player.getLatest() == null) return;
Player p = Player.getLatest();
Expand Down Expand Up @@ -144,7 +123,7 @@ public void loaded() {
EventAPI.addListener(
EventAPI.EventListener.onRenderOverlay(
e -> {
if (!displayOverlay) return;
if (!Settings.displayOverlay.getValue()) return;
if (Minecraft.isF3Enabled()) return;

Profiler.startSection("components");
Expand All @@ -164,7 +143,7 @@ public void loaded() {
EventAPI.addListener(
new EventAPI.EventListener<OnRenderWorldOverlayEvent>(
e -> {
if (!highlightLandingBlocks) return;
if (!Settings.highlightLandingBlocks.getValue()) return;

Profiler.startSection("renderLBOverlays");
LandingBlockGuiScreen.lbs.forEach(lb -> {
Expand Down
12 changes: 4 additions & 8 deletions common/src/main/java/io/github/kurrycat/mpkmod/compatibility/API.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import io.github.kurrycat.mpkmod.discord.DiscordRPC;
import io.github.kurrycat.mpkmod.events.*;
import io.github.kurrycat.mpkmod.gui.MPKGuiScreen;
import io.github.kurrycat.mpkmod.gui.screens.options_gui.Option;
import io.github.kurrycat.mpkmod.modules.MPKModule;
import io.github.kurrycat.mpkmod.modules.MPKModuleImpl;
import io.github.kurrycat.mpkmod.modules.ModuleFinder;
import io.github.kurrycat.mpkmod.modules.ModuleManager;
import io.github.kurrycat.mpkmod.network.impl.MPKPacketListenerClientImpl;
import io.github.kurrycat.mpkmod.save.Serializer;
import io.github.kurrycat.mpkmod.settings.Settings;
import io.github.kurrycat.mpkmod.util.ClassUtil;
import io.github.kurrycat.mpkmod.util.JSONConfig;
import io.github.kurrycat.mpkmod.util.Mouse;
Expand Down Expand Up @@ -50,12 +50,8 @@ public class API {
public static Map<String, MPKGuiScreen> guiScreenMap = new HashMap<>();
public static Map<String, Procedure> keyBindingMap = new HashMap<>();

public static HashMap<String, Option> optionsMap;
private static FunctionHolder functionHolder;

/*@Option.Field
public static String testOption = "String Option";*/

/*public static int metronome = 0;*/

/**
Expand All @@ -70,15 +66,15 @@ public static void preInit(Class<?> callerClass) {
JSONConfig.setupFiles();
Serializer.registerSerializer();

optionsMap = Option.createOptionMap();
Option.updateOptionMapFromJSON(true);

MPKModule mainModule = new Main();
ModuleManager.moduleMap.put("main", new MPKModuleImpl("main", mainModule, null));
mainModule.init();

ModuleFinder.init();
ModuleManager.initAllModules();

Settings.init();
Settings.loadSettings();
}

/**
Expand Down
15 changes: 4 additions & 11 deletions common/src/main/java/io/github/kurrycat/mpkmod/discord/DiscordRPC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import io.github.kurrycat.mpkmod.Main;
import io.github.kurrycat.mpkmod.compatibility.API;
import io.github.kurrycat.mpkmod.compatibility.MCClasses.Minecraft;
import io.github.kurrycat.mpkmod.gui.screens.options_gui.Option;
import io.github.kurrycat.mpkmod.settings.Settings;

import java.io.File;

Expand All @@ -16,13 +16,6 @@ public class DiscordRPC {
public static Core core = null;
public static boolean LIBRARY_LOADED = false;

@Option.Field(
category = "discord",
displayName = "Discord Rich Presence",
description = "Show \"Playing MPKMod\" in Discord"
)
public static boolean discordRPCEnabled = true;

public static void init() {
new Thread(DiscordRPC::_init).start();
}
Expand All @@ -38,20 +31,20 @@ private static void _init() {
API.LOGGER.info(API.DISCORD_RPC_MARKER, "DiscordRPC Core initialized.");
LIBRARY_LOADED = true;

Settings.discordRPCEnabled.onChange(setting -> onEnabledStatusChanged());
onEnabledStatusChanged();

startCallbackThread();
API.LOGGER.info(API.DISCORD_RPC_MARKER, "Started DiscordRPC callback thread");
}

@Option.ChangeListener(field = "discordRPCEnabled")
public static void onEnabledStatusChanged() {
if (!LIBRARY_LOADED) {
API.LOGGER.info(API.DISCORD_RPC_MARKER, "DiscordRPC library not loaded correctly, unable to update rich presence");
return;
}

if (discordRPCEnabled) enableRPC();
if (Settings.discordRPCEnabled.getValue()) enableRPC();
else disableRPC();
}

Expand Down Expand Up @@ -125,7 +118,7 @@ public static void updateWorldAndPlayState() {
private static void updateActivity(String details, String state) {
if (!LIBRARY_LOADED) return;
if (!Main.discordRpcInitialized) return;
if (!discordRPCEnabled) return;
if (!Settings.discordRPCEnabled.getValue()) return;

try (Activity activity = new Activity()) {
activity.setDetails(details);
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/io/github/kurrycat/mpkmod/gui/components/Label.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import io.github.kurrycat.mpkmod.compatibility.MCClasses.FontRenderer;
import io.github.kurrycat.mpkmod.compatibility.MCClasses.Renderer2D;
import io.github.kurrycat.mpkmod.gui.screens.options_gui.Option;
import io.github.kurrycat.mpkmod.util.Vector2D;

import java.awt.*;

public class Label extends Component {
@Option.Field(showInOptionList = false)

// TODO: Setting?
public static double DEFAULT_FONT_SIZE = FontRenderer.DEFAULT_FONT_SIZE;

@JsonProperty
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/io/github/kurrycat/mpkmod/gui/screens/main_gui/OptionsPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.github.kurrycat.mpkmod.gui.components.Button;
import io.github.kurrycat.mpkmod.gui.components.Label;
import io.github.kurrycat.mpkmod.gui.components.*;
import io.github.kurrycat.mpkmod.gui.screens.options_gui.Option;
import io.github.kurrycat.mpkmod.settings.Settings;
import io.github.kurrycat.mpkmod.util.ItrUtil;
import io.github.kurrycat.mpkmod.util.Vector2D;
import io.github.kurrycat.mpkmod.util.WorldToFile;
Expand All @@ -21,8 +21,7 @@ public OptionsPane(Vector2D pos, Vector2D size) {

@Override
public void close() {
Option.updateOptionMapFromFields();
Option.saveOptionMapToJSON();
Settings.saveSettings();
super.close();
}

Expand Down
Loading
Loading