Skip to content

Code cleanup/refactoring. Cleaner responsibility/control flow #270

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

Merged
tr7zw merged 8 commits into from
Apr 30, 2026
Merged

Code cleanup/refactoring. Cleaner responsibility/control flow #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a7cfe4
Extract networking/event logic to TRansition, remove 4 mixins
tr7zw Apr 19, 2026
8873f48
Formatting, remove redundant import
tr7zw Apr 19, 2026
3327c33
Merge branch 'main' into refactor
tr7zw Apr 26, 2026
3468039
Remove circular dependencies, clean util mess
tr7zw Apr 26, 2026
efe4681
Switch classes to record, remove public from interfaces
tr7zw Apr 26, 2026
a44efa9
Use TRansition Config logic, remove from god class
tr7zw Apr 26, 2026
3edd550
Further networking cleanup, SwapItemPayload only gets created from on…
tr7zw Apr 30, 2026
d2a3409
Separate out more logic for cleaner controlflow
tr7zw Apr 30, 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
5 changes: 0 additions & 5 deletions XTVersionless/src/main/java/dev/tr7zw/itemswapper/ItemSwapperBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import dev.tr7zw.itemswapper.config.CacheManager;
import dev.tr7zw.itemswapper.config.ConfigManager;

public class ItemSwapperBase {

public static final Logger LOGGER = LogManager.getLogger("ItemSwapper");
public static final String MODID = "itemswapper";
protected final ConfigManager configManager = ConfigManager.getInstance();
protected final CacheManager cacheManager = CacheManager.getInstance();

public ItemSwapperBase() {
super();
Expand Down
59 changes: 0 additions & 59 deletions XTVersionless/src/main/java/dev/tr7zw/itemswapper/config/CacheManager.java
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions XTVersionless/src/main/java/dev/tr7zw/itemswapper/config/ConfigHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package dev.tr7zw.itemswapper.config;

import dev.tr7zw.transition.config.ConfigManager;
import lombok.*;

@Getter
public class ConfigHolder {
@Getter
private final static ConfigHolder instance = new ConfigHolder();
private final ConfigManager<Config> general = new ConfigManager<>("itemswapper.json", Config::new,
ConfigUpgrader::upgradeConfig);
private final ConfigManager<CacheServerAddresses> serverCache = new ConfigManager<>("itemswapper-server-cache.json",
CacheServerAddresses::new, null);

public void save() {
general.writeConfig();
serverCache.writeConfig();
}

public void reset() {
general.reset();
serverCache.reset();
}
}
65 changes: 0 additions & 65 deletions XTVersionless/src/main/java/dev/tr7zw/itemswapper/config/ConfigManager.java
View file
Open in desktop

This file was deleted.

114 changes: 61 additions & 53 deletions src/main/java/dev/tr7zw/itemswapper/ConfigScreenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
import java.util.List;

import dev.tr7zw.itemswapper.compat.ViveCraftSupport;
import dev.tr7zw.itemswapper.config.CacheManager;
import dev.tr7zw.itemswapper.config.ConfigManager;
import dev.tr7zw.itemswapper.config.PickBlockMode;
import dev.tr7zw.itemswapper.config.*;
import dev.tr7zw.transition.config.*;
import dev.tr7zw.transition.mc.ComponentProvider;
import dev.tr7zw.trender.gui.client.AbstractConfigScreen;
import dev.tr7zw.trender.gui.client.BackgroundPainter;
Expand All @@ -25,7 +24,7 @@

public class ConfigScreenProvider {

private static final ConfigManager configManager = ConfigManager.getInstance();
private static final ConfigHolder configHolder = ConfigHolder.getInstance();

public static Screen createConfigScreen(Screen parent) {
return new ConfigScreen(parent).createScreen();
Expand All @@ -43,67 +42,76 @@ public ConfigScreen(Screen previous) {
// options page
List<OptionInstance> options = new ArrayList<>();
options.add(getSplitLine("text.itemswapper.category.visuals"));
options.add(getOnOffOption("text.itemswapper.showCursor", () -> configManager.getConfig().showCursor,
b -> configManager.getConfig().showCursor = b));
options.add(getOnOffOption("text.itemswapper.showTooltips", () -> configManager.getConfig().showTooltips,
b -> configManager.getConfig().showTooltips = b));
options.add(getOnOffOption("text.itemswapper.showCursor",
() -> configHolder.getGeneral().getConfig().showCursor,
b -> configHolder.getGeneral().getConfig().showCursor = b));
options.add(getOnOffOption("text.itemswapper.showTooltips",
() -> configHolder.getGeneral().getConfig().showTooltips,
b -> configHolder.getGeneral().getConfig().showTooltips = b));

options.add(getSplitLine("text.itemswapper.category.controls"));
options.add(getOnOffOption("text.itemswapper.toggleMode", () -> configManager.getConfig().toggleMode,
b -> configManager.getConfig().toggleMode = b));
options.add(
getOnOffOption("text.itemswapper.unlockListMouse", () -> configManager.getConfig().unlockListMouse,
b -> configManager.getConfig().unlockListMouse = b));
options.add(getOnOffOption("text.itemswapper.toggleMode",
() -> configHolder.getGeneral().getConfig().toggleMode,
b -> configHolder.getGeneral().getConfig().toggleMode = b));
options.add(getOnOffOption("text.itemswapper.unlockListMouse",
() -> configHolder.getGeneral().getConfig().unlockListMouse,
b -> configHolder.getGeneral().getConfig().unlockListMouse = b));
options.add(getDoubleOption("text.itemswapper.controllerSpeed", 1, 16, 0.1f,
() -> configManager.getConfig().controllerSpeed,
d -> configManager.getConfig().controllerSpeed = (float) d));
() -> configHolder.getGeneral().getConfig().controllerSpeed,
d -> configHolder.getGeneral().getConfig().controllerSpeed = (float) d));
options.add(getDoubleOption("text.itemswapper.mouseSpeed", 0.1f, 3, 0.1f,
() -> configManager.getConfig().mouseSpeed, d -> configManager.getConfig().mouseSpeed = (float) d));
() -> configHolder.getGeneral().getConfig().mouseSpeed,
d -> configHolder.getGeneral().getConfig().mouseSpeed = (float) d));

options.add(getSplitLine("text.itemswapper.category.behavior"));
options.add(getOnOffOption("text.itemswapper.creativeCheatMode",
() -> configManager.getConfig().creativeCheatMode,
b -> configManager.getConfig().creativeCheatMode = b));
options.add(getOnOffOption("text.itemswapper.ignoreHotbar", () -> configManager.getConfig().ignoreHotbar,
b -> configManager.getConfig().ignoreHotbar = b));
options.add(
getOnOffOption("text.itemswapper.disableShulkers", () -> configManager.getConfig().disableShulkers,
b -> configManager.getConfig().disableShulkers = b));
() -> configHolder.getGeneral().getConfig().creativeCheatMode,
b -> configHolder.getGeneral().getConfig().creativeCheatMode = b));
options.add(getOnOffOption("text.itemswapper.ignoreHotbar",
() -> configHolder.getGeneral().getConfig().ignoreHotbar,
b -> configHolder.getGeneral().getConfig().ignoreHotbar = b));
options.add(getOnOffOption("text.itemswapper.disableShulkers",
() -> configHolder.getGeneral().getConfig().disableShulkers,
b -> configHolder.getGeneral().getConfig().disableShulkers = b));
options.add(getOnOffOption("text.itemswapper.showOpenInventoryButton",
() -> configManager.getConfig().showOpenInventoryButton,
b -> configManager.getConfig().showOpenInventoryButton = b));
() -> configHolder.getGeneral().getConfig().showOpenInventoryButton,
b -> configHolder.getGeneral().getConfig().showOpenInventoryButton = b));
options.add(getOnOffOption("text.itemswapper.fallbackInventory",
() -> configManager.getConfig().fallbackInventory,
b -> configManager.getConfig().fallbackInventory = b));
() -> configHolder.getGeneral().getConfig().fallbackInventory,
b -> configHolder.getGeneral().getConfig().fallbackInventory = b));
options.add(getEnumOption("text.itemswapper.disablePickblockOnToolsWeapons", PickBlockMode.class,
() -> configManager.getConfig().pickblockOnToolsWeapons,
b -> configManager.getConfig().pickblockOnToolsWeapons = b));
() -> configHolder.getGeneral().getConfig().pickblockOnToolsWeapons,
b -> configHolder.getGeneral().getConfig().pickblockOnToolsWeapons = b));
options.add(getOnOffOption("text.itemswapper.allowWalkingWithUI",
() -> configManager.getConfig().allowWalkingWithUI,
b -> configManager.getConfig().allowWalkingWithUI = b));
options.add(getOnOffOption("text.itemswapper.startOnItem", () -> configManager.getConfig().startOnItem,
b -> configManager.getConfig().startOnItem = b));
options.add(
getOnOffOption("text.itemswapper.alwaysInventory", () -> configManager.getConfig().alwaysInventory,
b -> configManager.getConfig().alwaysInventory = b));
options.add(getOnOffOption("text.itemswapper.showHotbar", () -> configManager.getConfig().showHotbar,
b -> configManager.getConfig().showHotbar = b));
options.add(
getOnOffOption("text.itemswapper.rememberPalette", () -> configManager.getConfig().rememberPalette,
b -> configManager.getConfig().rememberPalette = b));
() -> configHolder.getGeneral().getConfig().allowWalkingWithUI,
b -> configHolder.getGeneral().getConfig().allowWalkingWithUI = b));
options.add(getOnOffOption("text.itemswapper.startOnItem",
() -> configHolder.getGeneral().getConfig().startOnItem,
b -> configHolder.getGeneral().getConfig().startOnItem = b));
options.add(getOnOffOption("text.itemswapper.alwaysInventory",
() -> configHolder.getGeneral().getConfig().alwaysInventory,
b -> configHolder.getGeneral().getConfig().alwaysInventory = b));
options.add(getOnOffOption("text.itemswapper.showHotbar",
() -> configHolder.getGeneral().getConfig().showHotbar,
b -> configHolder.getGeneral().getConfig().showHotbar = b));
options.add(getOnOffOption("text.itemswapper.rememberPalette",
() -> configHolder.getGeneral().getConfig().rememberPalette,
b -> configHolder.getGeneral().getConfig().rememberPalette = b));
options.add(getOnOffOption("text.itemswapper.autoPalette",
() -> configManager.getConfig().experimentalAutoPalette,
b -> configManager.getConfig().experimentalAutoPalette = b));
() -> configHolder.getGeneral().getConfig().experimentalAutoPalette,
b -> configHolder.getGeneral().getConfig().experimentalAutoPalette = b));
options.add(getOnOffOption("text.itemswapper.listsAsPalette",
() -> configManager.getConfig().listsAsPalette, b -> configManager.getConfig().listsAsPalette = b));
() -> configHolder.getGeneral().getConfig().listsAsPalette,
b -> configHolder.getGeneral().getConfig().listsAsPalette = b));

options.add(getSplitLine("text.itemswapper.category.misc"));
options.add(getOnOffOption("text.itemswapper.editMode", () -> configManager.getConfig().editMode,
b -> configManager.getConfig().editMode = b));
options.add(
getOnOffOption("text.itemswapper.editMode", () -> configHolder.getGeneral().getConfig().editMode,
b -> configHolder.getGeneral().getConfig().editMode = b));
if (ViveCraftSupport.getInstance().isAvailable()) {
options.add(getOnOffOption("text.itemswapper.vivecraftCompat",
() -> configManager.getConfig().vivecraftCompat,
b -> configManager.getConfig().vivecraftCompat = b));
() -> configHolder.getGeneral().getConfig().vivecraftCompat,
b -> configHolder.getGeneral().getConfig().vivecraftCompat = b));
}

var optionList = createOptionList(options);
Expand All @@ -112,9 +120,9 @@ public ConfigScreen(Screen previous) {

wTabPanel.add(optionList, b -> b.title(ComponentProvider.translatable("key.itemswapper.tab.options")));

wTabPanel.add(getList(CacheManager.getInstance().getCache().disableOnIp),
wTabPanel.add(getList(configHolder.getServerCache().getConfig().disableOnIp),
b -> b.title(ComponentProvider.translatable("text.itemswapper.blacklist")));
wTabPanel.add(getList(CacheManager.getInstance().getCache().enableOnIp),
wTabPanel.add(getList(configHolder.getServerCache().getConfig().enableOnIp),
b -> b.title(ComponentProvider.translatable("text.itemswapper.whitelist")));

root.add(wTabPanel, 0, 1);
Expand Down Expand Up @@ -148,7 +156,7 @@ public WWidget getList(List<String> list) {
button.setOnClick(() -> {
list.remove(s);
panel.getParent().layout();
CacheManager.getInstance().writeConfig();
configHolder.save();
});
panel.add(button, 0, 0, 2, 2);
panel.add(new WLabel(ComponentProvider.literal(s)), 23, 5);
Expand All @@ -159,12 +167,12 @@ public WWidget getList(List<String> list) {

@Override
public void save() {
configManager.writeConfig();
configHolder.save();
}

@Override
public void reset() {
configManager.reset();
configHolder.reset();
}
}

Expand Down
Loading
Loading