ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

fix: revert cache close

Browse source
This commit is contained in:
ineanto 2023-09-01 22:24:44 +02:00
parent 94bb9ffc18
commit 6633ac94a8
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/xyz/atnrch/nicko/NickoBukkit.java
View file

@ -116,14 +116,6 @@ public class NickoBukkit extends JavaPlugin {
} else { } else {
getLogger().info("Persistence closed."); getLogger().info("Persistence closed.");
} }
if (!dataStore.getCache().getProvider().close()) {
if (!dataStore.getCache().getProvider().close()) {
getLogger().severe("Failed to close cache!");
} else {
getLogger().info("Cache closed.");
}
}
} }
getLogger().info("Nicko (Bukkit) has been disabled."); getLogger().info("Nicko (Bukkit) has been disabled.");

10
src/main/java/xyz/atnrch/nicko/gui/SettingsGUI.java
View file

@ -4,14 +4,15 @@ import xyz.atnrch.nicko.gui.items.common.GoBackItem;
import xyz.atnrch.nicko.gui.items.settings.BungeeCordCyclingItem; import xyz.atnrch.nicko.gui.items.settings.BungeeCordCyclingItem;
import xyz.atnrch.nicko.gui.items.settings.LanguageCyclingItem; import xyz.atnrch.nicko.gui.items.settings.LanguageCyclingItem;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import xyz.atnrch.nicko.i18n.I18N;
import xyz.atnrch.nicko.i18n.I18NDict;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.window.Window; import xyz.xenondevs.invui.window.Window;
public class SettingsGUI { public class SettingsGUI {
public static final String TITLE = "Nicko > Settings";
private final Player player; private final Player player;
private final Gui gui; private final Gui gui;
private final String title;
public SettingsGUI(Player player) { public SettingsGUI(Player player) {
final String[] dynamicStructure = new String[]{ final String[] dynamicStructure = new String[]{
@ -23,6 +24,9 @@ public class SettingsGUI {
// TODO: 3/6/23 Replace when Redis is not enabled // TODO: 3/6/23 Replace when Redis is not enabled
dynamicStructure[1] = dynamicStructure[1].replace("T", "U"); dynamicStructure[1] = dynamicStructure[1].replace("T", "U");
final I18N i18n = new I18N(player);
this.title = i18n.translatePrefixless(I18NDict.GUI.Settings.TITLE);
final HomeGUI parent = new HomeGUI(player); final HomeGUI parent = new HomeGUI(player);
final LanguageCyclingItem languageItem = new LanguageCyclingItem(player); final LanguageCyclingItem languageItem = new LanguageCyclingItem(player);
final BungeeCordCyclingItem bungeeCordItem = new BungeeCordCyclingItem(player); final BungeeCordCyclingItem bungeeCordItem = new BungeeCordCyclingItem(player);
@ -38,6 +42,6 @@ public class SettingsGUI {
} }
public void open() { public void open() {
Window.single().setGui(gui).setTitle(TITLE).open(player); Window.single().setGui(gui).setTitle(title).open(player);
} }
} }

1
src/main/java/xyz/atnrch/nicko/storage/map/MapCacheProvider.java
View file

@ -19,7 +19,6 @@ public class MapCacheProvider implements CacheProvider {
@Override @Override
public boolean close() { public boolean close() {
profiles = null;
return true; return true;
} }

7
src/main/java/xyz/atnrch/nicko/storage/redis/RedisCacheProvider.java
View file

@ -1,5 +1,6 @@
package xyz.atnrch.nicko.storage.redis; package xyz.atnrch.nicko.storage.redis;
import redis.clients.jedis.exceptions.JedisConnectionException;
import xyz.atnrch.nicko.config.Configuration; import xyz.atnrch.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration; import xyz.atnrch.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.storage.CacheProvider; import xyz.atnrch.nicko.storage.CacheProvider;
@ -18,7 +19,11 @@ public class RedisCacheProvider implements CacheProvider {
public boolean init() { public boolean init() {
final DataSourceConfiguration redisConfiguration = configuration.getRedisConfiguration(); final DataSourceConfiguration redisConfiguration = configuration.getRedisConfiguration();
pool = new JedisPool(redisConfiguration.getAddress(), redisConfiguration.getPort()); pool = new JedisPool(redisConfiguration.getAddress(), redisConfiguration.getPort());
return !pool.isClosed() && pool.getResource() != null; try {
return !pool.isClosed() && pool.getResource() != null;
} catch (JedisConnectionException exception) {
return false;
}
} }
@Override @Override