Skip to content

Auto-save config changes #2

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
LordTricker wants to merge 1 commit into
base: ver/1.21.4xx
Choose a base branch
from
Open

Auto-save config changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Dostępnę Releasy: https://github.com/LordTricker/LT-Rynek/releases
| `/ltr remove <przedmiot>` | Usuwa przedmiot z profilu |
| `/ltr list` | Wyświetla przedmioty w aktywnym profilu |
| `/ltr pomoc` | Lista dostępnych komend |
| `/ltr config save` | Zapisuje konfigurację |
| `/ltr config save` | Ręcznie zapisuje konfigurację (zapis następuje też automatycznie) |
| `/ltr config reload` | Przeładowuje dane z konfiguracji |

## 🔧 Instalacja
Expand Down
43 changes: 23 additions & 20 deletions src/client/java/pl/lordtricker/ltrynek/client/LtrynekClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import pl.lordtricker.ltrynek.client.command.ClientCommandRegistration;
import pl.lordtricker.ltrynek.client.config.ConfigLoader;
import pl.lordtricker.ltrynek.client.config.ConfigSaver;
import pl.lordtricker.ltrynek.client.config.PriceEntry;
import pl.lordtricker.ltrynek.client.config.ServerEntry;
import pl.lordtricker.ltrynek.client.config.ServersConfig;
Expand Down Expand Up @@ -30,27 +31,29 @@ public void onInitializeClient() {
}
ClientPriceListManager.setActiveProfile(serversConfig.defaultProfile);

ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
String address = getServerAddress();
ServerEntry entry = findServerEntry(address);
if (entry != null) {
ClientPriceListManager.setActiveProfile(entry.profileName);
if (client.player != null) {
String welcomeMsg = Messages.format("player.join", Map.of("profile", entry.profileName));
client.player.sendMessage(ColorUtils.translateColorCodes(welcomeMsg), false);
}
} else {
String def = serversConfig.defaultProfile;
ClientPriceListManager.setActiveProfile(def);
if (client.player != null) {
String welcomeMsg = Messages.format("player.join", Map.of("profile", def));
client.player.sendMessage(ColorUtils.translateColorCodes(welcomeMsg), false);
}
}
});
ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
String address = getServerAddress();
ServerEntry entry = findServerEntry(address);
if (entry != null) {
ClientPriceListManager.setActiveProfile(entry.profileName);
if (client.player != null) {
String welcomeMsg = Messages.format("player.join", Map.of("profile", entry.profileName));
client.player.sendMessage(ColorUtils.translateColorCodes(welcomeMsg), false);
}
} else {
String def = serversConfig.defaultProfile;
ClientPriceListManager.setActiveProfile(def);
if (client.player != null) {
String welcomeMsg = Messages.format("player.join", Map.of("profile", def));
client.player.sendMessage(ColorUtils.translateColorCodes(welcomeMsg), false);
}
}
});

ClientCommandRegistration.registerCommands();
}
ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> ConfigSaver.save());

ClientCommandRegistration.registerCommands();
}

private String getServerAddress() {
if (MinecraftClient.getInstance().getCurrentServerEntry() != null) {
Expand Down
50 changes: 6 additions & 44 deletions src/client/java/pl/lordtricker/ltrynek/client/command/ClientCommandRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pl.lordtricker.ltrynek.client.LtrynekClient;
import pl.lordtricker.ltrynek.client.Messages;
import pl.lordtricker.ltrynek.client.config.ConfigLoader;
import pl.lordtricker.ltrynek.client.config.ConfigSaver;
import pl.lordtricker.ltrynek.client.config.PriceEntry;
import pl.lordtricker.ltrynek.client.config.ServerEntry;
import pl.lordtricker.ltrynek.client.price.ClientPriceListManager;
Expand Down Expand Up @@ -48,6 +49,8 @@ private static void registerLtrynekCommand(
.executes(ctx -> {
String profile = StringArgumentType.getString(ctx, "profile");
ClientPriceListManager.setActiveProfile(profile);
LtrynekClient.serversConfig.defaultProfile = profile;
ConfigSaver.save();

String msg = Messages.format("command.defaultprofile.success", Map.of("profile", profile));
ctx.getSource().sendFeedback(ColorUtils.translateColorCodes(msg));
Expand Down Expand Up @@ -115,6 +118,7 @@ private static void registerLtrynekCommand(
"profile", activeProfile
));
ctx.getSource().sendFeedback(ColorUtils.translateColorCodes(msg));
ConfigSaver.save();
} catch (NumberFormatException e) {
ctx.getSource().sendError(Text.literal("Invalid price format: " + maxPriceStr));
}
Expand All @@ -137,6 +141,7 @@ private static void registerLtrynekCommand(
"profile", activeProfile
));
ctx.getSource().sendFeedback(ColorUtils.translateColorCodes(msg));
ConfigSaver.save();
return 1;
})
)
Expand Down Expand Up @@ -227,9 +232,7 @@ private static void registerLtrynekCommand(
.then(ClientCommandManager.literal("config")
.then(ClientCommandManager.literal("save")
.executes(ctx -> {
syncMemoryToConfig();

ConfigLoader.saveConfig(LtrynekClient.serversConfig);
ConfigSaver.save();

String msg = Messages.get("command.config.save.success");
ctx.getSource().sendFeedback(ColorUtils.translateColorCodes(msg));
Expand All @@ -253,36 +256,6 @@ private static void registerLtrynekCommand(
);
}

/**
* Synchronizuje dane z pamięci (ClientPriceListManager) do obiektu LtrynekClient.serversConfig,
* tak aby /ltrynek config save mógł zapisać te zmiany do pliku.
*/
private static void syncMemoryToConfig() {
for (ServerEntry entry : LtrynekClient.serversConfig.servers) {
entry.prices.clear();
}
Map<String, Map<String, Double>> allProfiles = ClientPriceListManager.getAllProfiles();
for (Map.Entry<String, Map<String, Double>> profEntry : allProfiles.entrySet()) {
String profileName = profEntry.getKey();
Map<String, Double> items = profEntry.getValue();

ServerEntry se = findServerEntryByProfile(profileName);
if (se == null) {
continue;
}

for (Map.Entry<String, Double> itemEntry : items.entrySet()) {
String itemName = itemEntry.getKey();
double maxPrice = itemEntry.getValue();

PriceEntry pe = new PriceEntry();
pe.name = itemName;
pe.maxPrice = maxPrice;
se.prices.add(pe);
}
}
}

/**
* Czyści i na nowo inicjalizuje ClientPriceListManager z LtrynekClient.serversConfig.
*/
Expand All @@ -296,15 +269,4 @@ private static void reinitProfilesFromConfig() {
ClientPriceListManager.setActiveProfile(LtrynekClient.serversConfig.defaultProfile);
}

/**
* Znajduje ServerEntry w LtrynekClient.serversConfig dla danego profileName.
*/
private static ServerEntry findServerEntryByProfile(String profileName) {
for (ServerEntry entry : LtrynekClient.serversConfig.servers) {
if (entry.profileName.equals(profileName)) {
return entry;
}
}
return null;
}
}
64 changes: 64 additions & 0 deletions src/client/java/pl/lordtricker/ltrynek/client/config/ConfigSaver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package pl.lordtricker.ltrynek.client.config;

import pl.lordtricker.ltrynek.client.LtrynekClient;
import pl.lordtricker.ltrynek.client.price.ClientPriceListManager;

import java.util.Map;

/**
* Utility class that synchronizes in-memory price list data with the config file
* and persists it to disk.
*/
public class ConfigSaver {
/**
* Synchronizes data from ClientPriceListManager to LtrynekClient.serversConfig
* and writes the result to the config file.
*/
public static void save() {
syncMemoryToConfig();
ConfigLoader.saveConfig(LtrynekClient.serversConfig);
}

/**
* Synchronizes data from memory (ClientPriceListManager) to the serversConfig object,
* so that it can be saved to the config file.
*/
public static void syncMemoryToConfig() {
for (ServerEntry entry : LtrynekClient.serversConfig.servers) {
entry.prices.clear();
}
Map<String, Map<String, Double>> allProfiles = ClientPriceListManager.getAllProfiles();
for (Map.Entry<String, Map<String, Double>> profEntry : allProfiles.entrySet()) {
String profileName = profEntry.getKey();
Map<String, Double> items = profEntry.getValue();

ServerEntry se = findServerEntryByProfile(profileName);
if (se == null) {
continue;
}

for (Map.Entry<String, Double> itemEntry : items.entrySet()) {
String itemName = itemEntry.getKey();
double maxPrice = itemEntry.getValue();

PriceEntry pe = new PriceEntry();
pe.name = itemName;
pe.maxPrice = maxPrice;
se.prices.add(pe);
}
}
}

/**
* Finds the ServerEntry in serversConfig for the given profile name.
*/
private static ServerEntry findServerEntryByProfile(String profileName) {
for (ServerEntry entry : LtrynekClient.serversConfig.servers) {
if (entry.profileName.equals(profileName)) {
return entry;
}
}
return null;
}
}