mirror of
https://github.com/BentoBoxWorld/Level.git
synced 2024-12-25 02:27:38 +01:00
Removed uncaching as async saving can cause race condition
Fixed tests.
This commit is contained in:
parent
6e64d274e8
commit
c463170fdd
@ -16,6 +16,7 @@ import org.eclipse.jdt.annotation.NonNull;
|
|||||||
import org.eclipse.jdt.annotation.Nullable;
|
import org.eclipse.jdt.annotation.Nullable;
|
||||||
|
|
||||||
import world.bentobox.bentobox.api.addons.Addon;
|
import world.bentobox.bentobox.api.addons.Addon;
|
||||||
|
import world.bentobox.bentobox.api.addons.GameModeAddon;
|
||||||
import world.bentobox.bentobox.api.configuration.Config;
|
import world.bentobox.bentobox.api.configuration.Config;
|
||||||
import world.bentobox.bentobox.api.user.User;
|
import world.bentobox.bentobox.api.user.User;
|
||||||
import world.bentobox.bentobox.database.Database;
|
import world.bentobox.bentobox.database.Database;
|
||||||
@ -47,6 +48,13 @@ public class Level extends Addon {
|
|||||||
private ConfigSettings settings;
|
private ConfigSettings settings;
|
||||||
private Config<ConfigSettings> configObject = new Config<>(this, ConfigSettings.class);
|
private Config<ConfigSettings> configObject = new Config<>(this, ConfigSettings.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param settings the settings to set
|
||||||
|
*/
|
||||||
|
public void setSettings(ConfigSettings settings) {
|
||||||
|
this.settings = settings;
|
||||||
|
}
|
||||||
|
|
||||||
// Database handler for level data
|
// Database handler for level data
|
||||||
private Database<LevelsData> handler;
|
private Database<LevelsData> handler;
|
||||||
|
|
||||||
@ -89,6 +97,7 @@ public class Level extends Addon {
|
|||||||
* @param targetPlayer - UUID of target player
|
* @param targetPlayer - UUID of target player
|
||||||
* @return LevelsData object or null if not found
|
* @return LevelsData object or null if not found
|
||||||
*/
|
*/
|
||||||
|
@Nullable
|
||||||
public LevelsData getLevelsData(@NonNull UUID targetPlayer) {
|
public LevelsData getLevelsData(@NonNull UUID targetPlayer) {
|
||||||
// Get from database if not in cache
|
// Get from database if not in cache
|
||||||
if (!levelsCache.containsKey(targetPlayer) && handler.objectExists(targetPlayer.toString())) {
|
if (!levelsCache.containsKey(targetPlayer) && handler.objectExists(targetPlayer.toString())) {
|
||||||
@ -182,22 +191,39 @@ public class Level extends Addon {
|
|||||||
// Start the top ten and register it for clicks
|
// Start the top ten and register it for clicks
|
||||||
topTen = new TopTen(this);
|
topTen = new TopTen(this);
|
||||||
registerListener(topTen);
|
registerListener(topTen);
|
||||||
// Register commands for AcidIsland and BSkyBlock
|
// Register commands for GameModes
|
||||||
getPlugin().getAddonsManager().getGameModeAddons().stream()
|
getPlugin().getAddonsManager().getGameModeAddons().stream()
|
||||||
.filter(gm -> settings.getGameModes().contains(gm.getDescription().getName()))
|
.filter(gm -> settings
|
||||||
|
.getGameModes()
|
||||||
|
.contains(gm
|
||||||
|
.getDescription()
|
||||||
|
.getName()))
|
||||||
.forEach(gm -> {
|
.forEach(gm -> {
|
||||||
log("Level hooking into " + gm.getDescription().getName());
|
log("Level hooking into " + gm.getDescription().getName());
|
||||||
gm.getAdminCommand().ifPresent(adminCommand -> {
|
registerCommands(gm);
|
||||||
new AdminLevelCommand(this, adminCommand);
|
|
||||||
new AdminTopCommand(this, adminCommand);
|
|
||||||
});
|
|
||||||
gm.getPlayerCommand().ifPresent(playerCmd -> {
|
|
||||||
new IslandLevelCommand(this, playerCmd);
|
|
||||||
new IslandTopCommand(this, playerCmd);
|
|
||||||
new IslandValueCommand(this, playerCmd);
|
|
||||||
});
|
|
||||||
// Register placeholders
|
// Register placeholders
|
||||||
if (getPlugin().getPlaceholdersManager() != null) {
|
if (getPlugin().getPlaceholdersManager() != null) {
|
||||||
|
registerPlaceholders(gm);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Register new island listener
|
||||||
|
registerListener(new IslandTeamListeners(this));
|
||||||
|
registerListener(new JoinLeaveListener(this));
|
||||||
|
|
||||||
|
// Register request handlers
|
||||||
|
registerRequestHandler(new LevelRequestHandler(this));
|
||||||
|
registerRequestHandler(new TopTenRequestHandler(this));
|
||||||
|
|
||||||
|
// Check if WildStackers is enabled on the server
|
||||||
|
// I only added support for counting blocks into the island level
|
||||||
|
// Someone else can PR if they want spawners added to the Leveling system :)
|
||||||
|
CalcIslandLevel.stackersEnabled = Bukkit.getPluginManager().getPlugin("WildStacker") != null;
|
||||||
|
|
||||||
|
// Done
|
||||||
|
}
|
||||||
|
|
||||||
|
private void registerPlaceholders(GameModeAddon gm) {
|
||||||
// Island Level
|
// Island Level
|
||||||
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
|
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
|
||||||
gm.getDescription().getName().toLowerCase() + "_island_level",
|
gm.getDescription().getName().toLowerCase() + "_island_level",
|
||||||
@ -205,11 +231,7 @@ public class Level extends Addon {
|
|||||||
|
|
||||||
// Visited Island Level
|
// Visited Island Level
|
||||||
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
|
getPlugin().getPlaceholdersManager().registerPlaceholder(this,
|
||||||
gm.getDescription().getName().toLowerCase() + "_visited_island_level",
|
gm.getDescription().getName().toLowerCase() + "_visited_island_level", user -> getVisitedIslandLevel(gm, user));
|
||||||
user -> getPlugin().getIslands().getIslandAt(user.getLocation())
|
|
||||||
.map(island -> getIslandLevel(gm.getOverWorld(), island.getOwner()))
|
|
||||||
.map(level -> getLevelPresenter().getLevelString(level))
|
|
||||||
.orElse("0"));
|
|
||||||
|
|
||||||
// Top Ten
|
// Top Ten
|
||||||
for (int i = 1; i <= 10; i++) {
|
for (int i = 1; i <= 10; i++) {
|
||||||
@ -230,25 +252,26 @@ public class Level extends Addon {
|
|||||||
return values.size() < rank ? "" : getPlayers().getName(values.stream().skip(rank - 1).findFirst().orElse(null));
|
return values.size() < rank ? "" : getPlayers().getName(values.stream().skip(rank - 1).findFirst().orElse(null));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getVisitedIslandLevel(GameModeAddon gm, User user) {
|
||||||
|
return getIslands().getIslandAt(user.getLocation())
|
||||||
|
.map(island -> getIslandLevel(gm.getOverWorld(), island.getOwner()))
|
||||||
|
.map(level -> getLevelPresenter().getLevelString(level))
|
||||||
|
.orElse("0");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void registerCommands(GameModeAddon gm) {
|
||||||
|
gm.getAdminCommand().ifPresent(adminCommand -> {
|
||||||
|
new AdminLevelCommand(this, adminCommand);
|
||||||
|
new AdminTopCommand(this, adminCommand);
|
||||||
|
});
|
||||||
|
gm.getPlayerCommand().ifPresent(playerCmd -> {
|
||||||
|
new IslandLevelCommand(this, playerCmd);
|
||||||
|
new IslandTopCommand(this, playerCmd);
|
||||||
|
new IslandValueCommand(this, playerCmd);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Register new island listener
|
|
||||||
registerListener(new IslandTeamListeners(this));
|
|
||||||
registerListener(new JoinLeaveListener(this));
|
|
||||||
|
|
||||||
// Register request handlers
|
|
||||||
registerRequestHandler(new LevelRequestHandler(this));
|
|
||||||
registerRequestHandler(new TopTenRequestHandler(this));
|
|
||||||
|
|
||||||
// Check if WildStackers is enabled on the server
|
|
||||||
if (Bukkit.getPluginManager().getPlugin("WildStacker") != null) {
|
|
||||||
// I only added support for counting blocks into the island level
|
|
||||||
// Someone else can PR if they want spawners added to the Leveling system :)
|
|
||||||
CalcIslandLevel.stackersEnabled = true;
|
|
||||||
} else CalcIslandLevel.stackersEnabled = false;
|
|
||||||
|
|
||||||
// Done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -316,13 +339,6 @@ public class Level extends Addon {
|
|||||||
return handler;
|
return handler;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void uncachePlayer(@Nullable UUID uniqueId) {
|
|
||||||
if (levelsCache.containsKey(uniqueId) && levelsCache.get(uniqueId) != null) {
|
|
||||||
handler.saveObject(levelsCache.get(uniqueId));
|
|
||||||
}
|
|
||||||
levelsCache.remove(uniqueId);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Addon getInstance() {
|
public static Addon getInstance() {
|
||||||
return addon;
|
return addon;
|
||||||
}
|
}
|
||||||
|
@ -4,12 +4,11 @@ import org.bukkit.event.EventHandler;
|
|||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
|
||||||
|
|
||||||
import world.bentobox.level.Level;
|
import world.bentobox.level.Level;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Listens for when players join and leave
|
* Listens for when players join
|
||||||
* @author tastybento
|
* @author tastybento
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@ -36,10 +35,4 @@ public class JoinLeaveListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
|
||||||
public void onPlayerQuit(PlayerQuitEvent e) {
|
|
||||||
addon.uncachePlayer(e.getPlayer().getUniqueId());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,10 +7,7 @@ import world.bentobox.level.Level;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @author tastybento
|
* @author tastybento
|
||||||
*
|
|
||||||
* @deprecated As of 1.9.0, for removal.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
|
||||||
public class LevelPlaceholder implements PlaceholderReplacer {
|
public class LevelPlaceholder implements PlaceholderReplacer {
|
||||||
|
|
||||||
private final Level addon;
|
private final Level addon;
|
||||||
|
@ -23,6 +23,7 @@ import world.bentobox.bentobox.managers.IslandWorldManager;
|
|||||||
import world.bentobox.bentobox.managers.IslandsManager;
|
import world.bentobox.bentobox.managers.IslandsManager;
|
||||||
import world.bentobox.level.calculators.PlayerLevel;
|
import world.bentobox.level.calculators.PlayerLevel;
|
||||||
import world.bentobox.level.config.BlockConfig;
|
import world.bentobox.level.config.BlockConfig;
|
||||||
|
import world.bentobox.level.config.ConfigSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author tastybento
|
* @author tastybento
|
||||||
@ -39,7 +40,9 @@ public class LevelPresenterTest {
|
|||||||
@Mock
|
@Mock
|
||||||
private PlayerLevel pl;
|
private PlayerLevel pl;
|
||||||
@Mock
|
@Mock
|
||||||
private BlockConfig settings;
|
private ConfigSettings settings;
|
||||||
|
@Mock
|
||||||
|
private BlockConfig blockConfig;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
@ -60,6 +63,7 @@ public class LevelPresenterTest {
|
|||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
when(addon.getSettings()).thenReturn(settings);
|
when(addon.getSettings()).thenReturn(settings);
|
||||||
|
when(addon.getBlockConfig()).thenReturn(blockConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -99,7 +103,7 @@ public class LevelPresenterTest {
|
|||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testGetLevelStringLongShorthand() {
|
public void testGetLevelStringLongShorthand() {
|
||||||
when(settings.isShortHand()).thenReturn(true);
|
when(settings.isShorthand()).thenReturn(true);
|
||||||
LevelPresenter lp = new LevelPresenter(addon, plugin);
|
LevelPresenter lp = new LevelPresenter(addon, plugin);
|
||||||
assertEquals("123.5M", lp.getLevelString(123456789L));
|
assertEquals("123.5M", lp.getLevelString(123456789L));
|
||||||
assertEquals("1.2k", lp.getLevelString(1234L));
|
assertEquals("1.2k", lp.getLevelString(1234L));
|
||||||
|
@ -65,6 +65,8 @@ import world.bentobox.bentobox.managers.FlagsManager;
|
|||||||
import world.bentobox.bentobox.managers.IslandWorldManager;
|
import world.bentobox.bentobox.managers.IslandWorldManager;
|
||||||
import world.bentobox.bentobox.managers.IslandsManager;
|
import world.bentobox.bentobox.managers.IslandsManager;
|
||||||
import world.bentobox.bentobox.managers.PlaceholdersManager;
|
import world.bentobox.bentobox.managers.PlaceholdersManager;
|
||||||
|
import world.bentobox.level.config.BlockConfig;
|
||||||
|
import world.bentobox.level.config.ConfigSettings;
|
||||||
import world.bentobox.level.listeners.IslandTeamListeners;
|
import world.bentobox.level.listeners.IslandTeamListeners;
|
||||||
import world.bentobox.level.listeners.JoinLeaveListener;
|
import world.bentobox.level.listeners.JoinLeaveListener;
|
||||||
|
|
||||||
@ -94,8 +96,6 @@ public class LevelTest {
|
|||||||
private AddonsManager am;
|
private AddonsManager am;
|
||||||
@Mock
|
@Mock
|
||||||
private BukkitScheduler scheduler;
|
private BukkitScheduler scheduler;
|
||||||
@Mock
|
|
||||||
private Settings settings;
|
|
||||||
|
|
||||||
private Level addon;
|
private Level addon;
|
||||||
|
|
||||||
@ -113,14 +113,23 @@ public class LevelTest {
|
|||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private PluginManager pim;
|
private PluginManager pim;
|
||||||
|
@Mock
|
||||||
|
private BlockConfig blockConfig;
|
||||||
|
@Mock
|
||||||
|
private Settings pluginSettings;
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void beforeClass() throws IOException {
|
public static void beforeClass() throws IOException {
|
||||||
|
// Make the addon jar
|
||||||
jFile = new File("addon.jar");
|
jFile = new File("addon.jar");
|
||||||
// Copy over config file from src folder
|
// Copy over config file from src folder
|
||||||
Path fromPath = Paths.get("src/main/resources/config.yml");
|
Path fromPath = Paths.get("src/main/resources/config.yml");
|
||||||
Path path = Paths.get("config.yml");
|
Path path = Paths.get("config.yml");
|
||||||
Files.copy(fromPath, path);
|
Files.copy(fromPath, path);
|
||||||
|
// Copy over block config file from src folder
|
||||||
|
fromPath = Paths.get("src/main/resources/blockconfig.yml");
|
||||||
|
path = Paths.get("blockconfig.yml");
|
||||||
|
Files.copy(fromPath, path);
|
||||||
try (JarOutputStream tempJarOutputStream = new JarOutputStream(new FileOutputStream(jFile))) {
|
try (JarOutputStream tempJarOutputStream = new JarOutputStream(new FileOutputStream(jFile))) {
|
||||||
//Added the new files to the jar.
|
//Added the new files to the jar.
|
||||||
try (FileInputStream fis = new FileInputStream(path.toFile())) {
|
try (FileInputStream fis = new FileInputStream(path.toFile())) {
|
||||||
@ -185,6 +194,7 @@ public class LevelTest {
|
|||||||
addon.setFile(jFile);
|
addon.setFile(jFile);
|
||||||
AddonDescription desc = new AddonDescription.Builder("bentobox", "Level", "1.3").description("test").authors("tastybento").build();
|
AddonDescription desc = new AddonDescription.Builder("bentobox", "Level", "1.3").description("test").authors("tastybento").build();
|
||||||
addon.setDescription(desc);
|
addon.setDescription(desc);
|
||||||
|
addon.setSettings(new ConfigSettings());
|
||||||
// Addons manager
|
// Addons manager
|
||||||
when(plugin.getAddonsManager()).thenReturn(am);
|
when(plugin.getAddonsManager()).thenReturn(am);
|
||||||
// One game mode
|
// One game mode
|
||||||
@ -205,9 +215,9 @@ public class LevelTest {
|
|||||||
when(fm.getFlags()).thenReturn(Collections.emptyList());
|
when(fm.getFlags()).thenReturn(Collections.emptyList());
|
||||||
|
|
||||||
// The database type has to be created one line before the thenReturn() to work!
|
// The database type has to be created one line before the thenReturn() to work!
|
||||||
when(plugin.getSettings()).thenReturn(settings);
|
|
||||||
DatabaseType value = DatabaseType.JSON;
|
DatabaseType value = DatabaseType.JSON;
|
||||||
when(settings.getDatabaseType()).thenReturn(value);
|
when(plugin.getSettings()).thenReturn(pluginSettings);
|
||||||
|
when(pluginSettings.getDatabaseType()).thenReturn(value);
|
||||||
|
|
||||||
// Bukkit
|
// Bukkit
|
||||||
PowerMockito.mockStatic(Bukkit.class);
|
PowerMockito.mockStatic(Bukkit.class);
|
||||||
@ -243,6 +253,7 @@ public class LevelTest {
|
|||||||
public static void cleanUp() throws Exception {
|
public static void cleanUp() throws Exception {
|
||||||
new File("addon.jar").delete();
|
new File("addon.jar").delete();
|
||||||
new File("config.yml").delete();
|
new File("config.yml").delete();
|
||||||
|
new File("blockconfig.yml").delete();
|
||||||
deleteAll(new File("addons"));
|
deleteAll(new File("addons"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -261,7 +272,7 @@ public class LevelTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testOnEnable() {
|
public void testOnEnable() {
|
||||||
addon.onEnable();
|
addon.onEnable();
|
||||||
verify(plugin).logWarning("[Level] Level Addon: No such world in config.yml : acidisland_world");
|
verify(plugin).logWarning("[Level] Level Addon: No such world in blockconfig.yml : acidisland_world");
|
||||||
verify(plugin).log("[Level] Level hooking into BSkyBlock");
|
verify(plugin).log("[Level] Level hooking into BSkyBlock");
|
||||||
verify(cmd, times(3)).getAddon(); // Three commands
|
verify(cmd, times(3)).getAddon(); // Three commands
|
||||||
verify(adminCmd, times(2)).getAddon(); // Two commands
|
verify(adminCmd, times(2)).getAddon(); // Two commands
|
||||||
@ -311,8 +322,8 @@ public class LevelTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testGetSettings() {
|
public void testGetSettings() {
|
||||||
addon.onEnable();
|
addon.onEnable();
|
||||||
world.bentobox.level.config.BlockConfig s = addon.getSettings();
|
ConfigSettings s = addon.getSettings();
|
||||||
assertEquals(100, s.getDeathPenalty());
|
assertEquals(100, s.getLevelCost());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user