Skip to content

Commit

Permalink
Update TNPC, Add not saved warning to MyEco, add saved message.
Browse files Browse the repository at this point in the history
  • Loading branch information
creatorfromhell committed Aug 5, 2024
1 parent 2e4d98e commit 474a0c7
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .changelog/0.1.3.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

## Minor Changes
- Added new currency type, experience-level, which uses experience levels instead of experience itself.
- Added message that is sent when currencies are saved from menu.
- Added message that is sent when MyECO is closed, but currencies weren't saved.

## Internals

Expand Down
2 changes: 2 additions & 0 deletions Core/resources/messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ Messages:

Main:
Currencies: "Currencies"
CloseWarn: "<red>The currencies weren't saved! Your changes will be reset on restart if you don't click the save icon."
Saved: "<green>Successfully saved the currencies!"

Currency:
SaveLore: "Click to save the currencies."
Expand Down
29 changes: 29 additions & 0 deletions Core/src/net/tnemc/core/menu/MyEcoMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import net.tnemc.menu.core.icon.impl.StateIcon;
import net.tnemc.menu.core.viewer.MenuViewer;
import net.tnemc.plugincore.PluginCore;
import net.tnemc.plugincore.core.compatibility.PlayerProvider;
import net.tnemc.plugincore.core.io.message.MessageData;
import net.tnemc.plugincore.core.io.message.MessageHandler;

Expand Down Expand Up @@ -132,6 +133,22 @@ public MyEcoMenu() {
*/
final Page currency = new PageBuilder(CURRENCIES_PAGE).build();
currency.addIcon(new PreviousPageIcon(0, this.name, 1, ActionType.ANY));
setClose((close)->{

final Optional<MenuViewer> viewer = close.getPlayer().viewer();
if(viewer.isPresent()) {

final Optional<Object> saved = viewer.get().findData("CURRENCY_SAVED_CONFIRM");
if(saved.isEmpty()) {

final Optional<PlayerProvider> provider = PluginCore.server().findPlayer(viewer.get().uuid());
if(provider.isPresent()) {
provider.get().message(new MessageData("Messages.Menu.MyEco.Main.CloseWarn"));
}
}
}

});
currency.setOpen((open)->{

if(open.getPlayer().viewer().isPresent()) {
Expand All @@ -156,6 +173,18 @@ public MyEcoMenu() {
TNECore.eco().currency().getCurIDMap().clear();

TNECore.eco().currency().getLoader().loadCurrencies(directory);


final Optional<MenuViewer> viewer = click.player().viewer();
if(viewer.isPresent()) {
viewer.get().addData("CURRENCY_SAVED_CONFIRM", true);
}

final Optional<PlayerProvider> provider = PluginCore.server().findPlayer(id);
if(provider.isPresent()) {
provider.get().message(new MessageData("Messages.Menu.MyEco.Main.Saved"));
}

} catch(NoValidCurrenciesException ignore) {}
}), new PageSwitchWithClose(this.name, -1))
.withSlot(6)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<properties>
<tnml.version>1.5.0.1-SNAPSHOT-18</tnml.version>
<tnpc.version>1.0.0.2-Pre-5</tnpc.version>
<tnpc.version>1.0.0.2-Pre-6</tnpc.version>
<tne.relocation>net.tnemc.libs</tne.relocation>
<tne.java>17</tne.java>
<maven.compiler.target>17</maven.compiler.target>
Expand Down

0 comments on commit 474a0c7

Please sign in to comment.