From a6546a1abe954b394c40be58d73d6fb03d93709e Mon Sep 17 00:00:00 2001 From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> Date: Sat, 28 May 2022 15:53:16 +0000 Subject: added config saving (#149) * i am unsure why this was here but it doesnt seem needed * saving config when closing menus with configs * Chatting --- .../notenoughupdates/commands/repo/ReloadRepoCommand.java | 12 ------------ .../moulberry/notenoughupdates/miscgui/GuiEnchantColour.java | 5 +++++ .../notenoughupdates/miscgui/GuiInvButtonEditor.java | 6 ++++++ .../moulberry/notenoughupdates/options/NEUConfigEditor.java | 3 +++ 4 files changed, 14 insertions(+), 12 deletions(-) (limited to 'src/main') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ReloadRepoCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ReloadRepoCommand.java index c4ef8c2c..7e58088f 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ReloadRepoCommand.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ReloadRepoCommand.java @@ -24,17 +24,5 @@ public class ReloadRepoCommand extends ClientCommandBase { } else { NotEnoughUpdates.INSTANCE.manager.reloadRepository(); } - NotEnoughUpdates.INSTANCE.newConfigFile(); - if (NotEnoughUpdates.INSTANCE.getConfigFile().exists()) { - try ( - BufferedReader reader = new BufferedReader(new InputStreamReader( - new FileInputStream(NotEnoughUpdates.INSTANCE.getConfigFile()), - StandardCharsets.UTF_8 - )) - ) { - NotEnoughUpdates.INSTANCE.config = NotEnoughUpdates.INSTANCE.manager.gson.fromJson(reader, NEUConfig.class); - } catch (Exception ignored) { - } - } } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java index 5a8fd901..2ed708e9 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java @@ -420,6 +420,11 @@ public class GuiEnchantColour extends GuiScreen { } } + @Override + public void onGuiClosed() { + NotEnoughUpdates.INSTANCE.saveConfig(); + } + @Override protected void keyTyped(char typedChar, int keyCode) throws IOException { super.keyTyped(typedChar, keyCode); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java index 83880846..d65a18b0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ResourceLocation; +import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -841,6 +842,11 @@ public class GuiInvButtonEditor extends GuiScreen { private final ExecutorService searchES = Executors.newSingleThreadExecutor(); private final AtomicInteger searchId = new AtomicInteger(0); + @Override + public void onGuiClosed() { + NotEnoughUpdates.INSTANCE.saveConfig(); + } + public void search() { final int thisSearchId = searchId.incrementAndGet(); final String searchString = iconTextField.getText(); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java index 83ade3a9..43c04698 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java @@ -886,5 +886,8 @@ public class NEUConfigEditor extends GuiElement { target.setTarget(target.getTarget() - 5); } } + if (Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) { + NotEnoughUpdates.INSTANCE.saveConfig(); + } } } -- cgit