diff --git a/src/main/java/com/alttd/commands/subcommands/CommandPoints.java b/src/main/java/com/alttd/commands/subcommands/CommandPoints.java index b8c1e31..7aeb251 100644 --- a/src/main/java/com/alttd/commands/subcommands/CommandPoints.java +++ b/src/main/java/com/alttd/commands/subcommands/CommandPoints.java @@ -6,7 +6,7 @@ import com.alttd.objects.EconUser; import com.alttd.objects.Price; import com.alttd.objects.VillagerType; import com.alttd.util.Logger; -import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; @@ -42,7 +42,7 @@ public class CommandPoints extends SubCommand { AtomicBoolean allPointsAreZero = new AtomicBoolean(true); - Object2ObjectArrayMap pointsMap = user.getPointsMap(); + Object2ObjectOpenHashMap pointsMap = user.getPointsMap(); pointsMap.keySet().forEach(key -> { VillagerType villagerType = VillagerType.getVillagerType(key); if (villagerType == null) { @@ -67,7 +67,7 @@ public class CommandPoints extends SubCommand { if (args[1].equals("all")) { for (VillagerType villagerType : VillagerType.getVillagerTypes()) { - Object2ObjectArrayMap pointsMap = user.getPointsMap(); + Object2ObjectOpenHashMap pointsMap = user.getPointsMap(); int currentPoints = pointsMap.getOrDefault(villagerType.getName(), 0); ref.message = ref.message.append(miniMessage.deserialize("\n", TagResolver.resolver())); ref.message = ref.message.append(miniMessage.deserialize(Config.POINTS_CONTENT, TagResolver.resolver( @@ -79,7 +79,7 @@ public class CommandPoints extends SubCommand { } } else { VillagerType villagerType = VillagerType.getVillagerType(args[1].toLowerCase()); - Object2ObjectArrayMap pointsMap = user.getPointsMap(); + Object2ObjectOpenHashMap pointsMap = user.getPointsMap(); if (villagerType == null) { player.sendMiniMessage(Config.NOT_A_VILLAGER, TagResolver.resolver(Placeholder.unparsed("villager_type", args[1]))); return true; diff --git a/src/main/java/com/alttd/database/Queries.java b/src/main/java/com/alttd/database/Queries.java index e484365..d9d8b6e 100644 --- a/src/main/java/com/alttd/database/Queries.java +++ b/src/main/java/com/alttd/database/Queries.java @@ -2,7 +2,7 @@ package com.alttd.database; import com.alttd.objects.EconUser; import com.alttd.util.Logger; -import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -20,7 +20,7 @@ public class Queries { * @param uuid Uuid for the user you want to add the points to * @param pointsMap Contains all (villagerType, points) entries for user */ - public static void updateUserPoints(UUID uuid, Object2ObjectArrayMap pointsMap) { + public static void updateUserPoints(UUID uuid, Object2ObjectOpenHashMap pointsMap) { String sql = "INSERT INTO user_points " + "(uuid, villager_type, points) " + "VALUES (?, ?, ?) " + @@ -63,7 +63,7 @@ public class Queries { preparedStatement.setString(1, uuid.toString()); ResultSet resultSet = preparedStatement.executeQuery(); - Object2ObjectArrayMap points = new Object2ObjectArrayMap<>(); + Object2ObjectOpenHashMap points = new Object2ObjectOpenHashMap<>(); while (resultSet.next()) { points.put( resultSet.getString("villager_type"), @@ -74,7 +74,7 @@ public class Queries { } catch (SQLException e) { e.printStackTrace(); } - return (new EconUser(uuid, new Object2ObjectArrayMap<>())); + return (new EconUser(uuid, new Object2ObjectOpenHashMap<>())); } /** diff --git a/src/main/java/com/alttd/objects/EconUser.java b/src/main/java/com/alttd/objects/EconUser.java index 34952ed..a075add 100644 --- a/src/main/java/com/alttd/objects/EconUser.java +++ b/src/main/java/com/alttd/objects/EconUser.java @@ -6,7 +6,7 @@ import com.alttd.database.Queries; import com.alttd.util.Logger; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.Unmodifiable; @@ -17,14 +17,14 @@ import java.util.stream.Collectors; public class EconUser { - private static Object2ObjectArrayMap users = new Object2ObjectArrayMap<>(); + private static Object2ObjectOpenHashMap users = new Object2ObjectOpenHashMap<>(); private final static Queue addQueue = new LinkedBlockingQueue<>(); private final static Queue removeQueue = new LinkedBlockingQueue<>(); private final UUID uuid; - private final Object2ObjectArrayMap pointsMap; + private final Object2ObjectOpenHashMap pointsMap; - public EconUser(UUID uuid, Object2ObjectArrayMap points) { + public EconUser(UUID uuid, Object2ObjectOpenHashMap points) { this.uuid = uuid; this.pointsMap = points; addQueue.offer(this); @@ -41,7 +41,7 @@ public class EconUser { return uuid; } - public Object2ObjectArrayMap getPointsMap() { + public Object2ObjectOpenHashMap getPointsMap() { return pointsMap; } @@ -149,7 +149,7 @@ public class EconUser { private static void updateUsers() { if (addQueue.isEmpty() && removeQueue.isEmpty()) return; - Object2ObjectArrayMap tmp = new Object2ObjectArrayMap<>(users); + Object2ObjectOpenHashMap tmp = new Object2ObjectOpenHashMap<>(users); while (!addQueue.isEmpty()) { EconUser user = addQueue.poll(); if (user == null)