diff --git a/jar/FreedyMinigameMaker2.jar b/jar/FreedyMinigameMaker2.jar index 63adb6e..2ee0f1d 100644 Binary files a/jar/FreedyMinigameMaker2.jar and b/jar/FreedyMinigameMaker2.jar differ diff --git a/src/main/java/kr/jongwonlee/fmg/FMGListener.java b/src/main/java/kr/jongwonlee/fmg/FMGListener.java index 65c2f09..28dabda 100644 --- a/src/main/java/kr/jongwonlee/fmg/FMGListener.java +++ b/src/main/java/kr/jongwonlee/fmg/FMGListener.java @@ -1,13 +1,10 @@ package kr.jongwonlee.fmg; import com.eatthepath.uuid.FastUUID; -import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.game.GameData; import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.EventBundle; -import kr.jongwonlee.fmg.proc.ProcTarget; -import kr.jongwonlee.fmg.proc.ProcUnit; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -41,7 +38,7 @@ public void onJoin(PlayerJoinEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("joinMessage", event.getJoinMessage()); game.run(EventBundle.JOIN, player); String joinMessage = playerData.getData("joinMessage"); @@ -54,7 +51,7 @@ public void onQuit(PlayerQuitEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("leftMessage", event.getQuitMessage()); game.run(EventBundle.LEFT, player); String joinMessage = playerData.getData("leftMessage"); @@ -67,7 +64,7 @@ public void onMove(PlayerMoveEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setLocation("moveFrom", event.getFrom().clone()); playerData.setLocation("moveTo", event.getTo().clone()); String result = game.run(EventBundle.MOVE, player); @@ -79,7 +76,7 @@ public void onInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("interactAction", event.getAction().name()); EquipmentSlot hand = event.getHand(); playerData.setData("interactHand", hand == null ? "null" : hand.name()); @@ -97,7 +94,7 @@ public void onChat(AsyncPlayerChatEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("chat", event.getMessage()); String result = GameStore.getGame(player).run(EventBundle.CHAT, player); if (result.equals("false")) event.setCancelled(true); @@ -109,7 +106,7 @@ public void onTeleport(PlayerTeleportEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setLocation("teleportFrom", event.getFrom()); playerData.setLocation("teleportTo", event.getTo()); String result = GameStore.getGame(player).run(EventBundle.TELEPORT, player); @@ -121,7 +118,7 @@ public void onCommand(PlayerCommandPreprocessEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("command", event.getMessage()); String result = GameStore.getGame(player).run(EventBundle.COMMAND, player); if (result.equals("false")) event.setCancelled(true); @@ -134,7 +131,7 @@ public void onInventoryClick(InventoryClickEvent event) { Player player = ((Player) humanEntity); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setInventory("inventoryClicked", event.getClickedInventory()); playerData.setData("inventoryHotBar", String.valueOf(event.getHotbarButton())); playerData.setItemStack("inventoryCursor", event.getCursor()); @@ -155,7 +152,7 @@ public void onInventoryDrag(InventoryDragEvent event) { Player player = ((Player) humanEntity); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setInventory("inventoryDrag", event.getInventory()); playerData.setList("inventorySlots", event.getInventorySlots().stream().map(String::valueOf).collect(Collectors.toList())); playerData.setList("inventoryRawSlots", event.getRawSlots().stream().map(String::valueOf).collect(Collectors.toList())); @@ -175,7 +172,7 @@ public void onInventoryClose(InventoryCloseEvent event) { Player player = ((Player) humanEntity); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setInventory("inventoryClosed", event.getInventory()); GameStore.getGame(player).run(EventBundle.INVENTORY_CLOSE, player); } @@ -187,7 +184,7 @@ public void onDamage(EntityDamageEvent event) { Player player = ((Player) entity); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("damage", String.valueOf(event.getDamage())); playerData.setData("damageCause", event.getCause().name()); playerData.setData("damageFinal", String.valueOf(event.getFinalDamage())); @@ -200,7 +197,7 @@ public void onDropItem(PlayerDropItemEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setItemStack("dropItem", event.getItemDrop().getItemStack()); String result = GameStore.getGame(player).run(EventBundle.DROP_ITEM, player); if (result.equals("false")) event.setCancelled(true); @@ -222,7 +219,7 @@ else if (attacker instanceof Projectile) { if (player != null) { if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setData("damage", String.valueOf(event.getDamage())); playerData.setData("damageCause", event.getCause().name()); playerData.setData("damageFinal", String.valueOf(event.getFinalDamage())); @@ -235,7 +232,7 @@ else if (attacker instanceof Projectile) { Player victimPlayer = (Player) entity; if (!victimPlayer.isOnline()) return; MiniGame game = GameStore.getGame(victimPlayer); - GameData playerData = GameDataStore.getPlayerData(victimPlayer.getUniqueId()); + GameData playerData = GameStore.getPlayerData(victimPlayer.getUniqueId()); playerData.setData("damage", String.valueOf(event.getDamage())); playerData.setData("damageCause", event.getCause().name()); playerData.setData("damageFinal", String.valueOf(event.getFinalDamage())); @@ -250,7 +247,7 @@ public void onSwapHand(PlayerSwapHandItemsEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setItemStack("mainHandItem", event.getMainHandItem()); playerData.setItemStack("offHandItem", event.getOffHandItem()); String result = GameStore.getGame(player).run(EventBundle.SWAP_HAND, player); @@ -262,7 +259,7 @@ public void onBreakBlock(BlockBreakEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setBlock("blockBreak", event.getBlock().getState()); String result = GameStore.getGame(player).run(EventBundle.BLOCK_BREAK, player); if (result.equals("false")) event.setCancelled(true); @@ -273,7 +270,7 @@ public void onPlaceBlock(BlockPlaceEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setBlock("blockPlace", event.getBlock().getState()); String result = GameStore.getGame(player).run(EventBundle.BLOCK_PLACE, player); if (result.equals("false")) event.setCancelled(true); @@ -284,7 +281,7 @@ public void onRespawn(PlayerRespawnEvent event) { Player player = event.getPlayer(); if (!player.isOnline()) return; MiniGame game = GameStore.getGame(player); - GameData playerData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData playerData = GameStore.getPlayerData(player.getUniqueId()); playerData.setLocation("respawnLocation", event.getRespawnLocation()); GameStore.getGame(player).run(EventBundle.PLAYER_RESPAWN, player); Location respawnLocation = playerData.getLocation("respawnLocation"); diff --git a/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java b/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java index a00494b..2db0d30 100644 --- a/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java +++ b/src/main/java/kr/jongwonlee/fmg/FMGPlugin.java @@ -10,7 +10,6 @@ import kr.jongwonlee.fmg.proc.EventBundle; import kr.jongwonlee.fmg.util.GameAlert; import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/kr/jongwonlee/fmg/conf/GameDataStore.java b/src/main/java/kr/jongwonlee/fmg/conf/GameDataStore.java index d9bac42..e9fe05e 100644 --- a/src/main/java/kr/jongwonlee/fmg/conf/GameDataStore.java +++ b/src/main/java/kr/jongwonlee/fmg/conf/GameDataStore.java @@ -2,15 +2,11 @@ import kr.jongwonlee.fmg.game.GameData; import kr.jongwonlee.fmg.util.YamlStore; +import org.bukkit.event.Listener; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -public class GameDataStore extends GameData { +public class GameDataStore extends GameData implements Listener { private static GameDataStore instance; - private static Map playersData; private static final YamlStore dataStore = new YamlStore("data.yml"); private static final YamlStore itemStackStore = new YamlStore("items.yml"); private static final YamlStore locationStore = new YamlStore("locations.yml"); @@ -25,15 +21,6 @@ public GameDataStore() { itemStackStore.getItemStackMap(""), inventoryStore.getInventoryMap(""), listStore.getListMap("")); - playersData = new HashMap<>(); - } - - public static Map getPlayersData() { - return playersData; - } - - public static GameData getPlayerData(UUID uuid) { - return playersData.getOrDefault(uuid, null); } public static GameDataStore getInst() { diff --git a/src/main/java/kr/jongwonlee/fmg/game/GameStore.java b/src/main/java/kr/jongwonlee/fmg/game/GameStore.java index dc88f19..714b538 100644 --- a/src/main/java/kr/jongwonlee/fmg/game/GameStore.java +++ b/src/main/java/kr/jongwonlee/fmg/game/GameStore.java @@ -18,8 +18,10 @@ public class GameStore implements Listener { private static Map playerGameMap; private static MiniGame hubGame; private static GameStore gameStore; + private static Map playersData; public static void init() { + playersData = new HashMap<>(); if (gameMap == null) gameMap = new HashMap<>(); if (playerGameMap == null) playerGameMap = new HashMap<>(); createGame(Settings.getHubGameName()); @@ -39,19 +41,31 @@ public static void init() { } } + public static Map getPlayersData() { + return playersData; + } + + public static GameData getPlayerData(UUID uuid) { + return playersData.getOrDefault(uuid, null); + } + @EventHandler(priority = EventPriority.LOWEST) public void onJoin(PlayerJoinEvent event) { final Player player = event.getPlayer(); - GameStore.getHubGame().join(player.getUniqueId()); + final UUID uniqueId = player.getUniqueId(); + playersData.put(uniqueId, new GameData()); + getHubGame().join(uniqueId); } @EventHandler(priority = EventPriority.HIGHEST) public void onQuit(PlayerQuitEvent event) { final Player player = event.getPlayer(); - MiniGame game = getGame(player); - if (game != null) game.quit(player.getUniqueId()); - getHubGame().quit(player.getUniqueId()); + final MiniGame game = getGame(player); + final UUID uniqueId = player.getUniqueId(); + if (game != null) game.quit(uniqueId); + getHubGame().quit(uniqueId); playerGameMap.remove(player); + playersData.remove(uniqueId); } public static MiniGame getGame(Player player) { diff --git a/src/main/java/kr/jongwonlee/fmg/game/MiniGame.java b/src/main/java/kr/jongwonlee/fmg/game/MiniGame.java index 067ca96..630e495 100644 --- a/src/main/java/kr/jongwonlee/fmg/game/MiniGame.java +++ b/src/main/java/kr/jongwonlee/fmg/game/MiniGame.java @@ -1,6 +1,5 @@ package kr.jongwonlee.fmg.game; -import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.proc.EventBundle; import kr.jongwonlee.fmg.proc.FileParser; import kr.jongwonlee.fmg.proc.ProcBundle; @@ -9,7 +8,10 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class MiniGame { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/FileParser.java b/src/main/java/kr/jongwonlee/fmg/proc/FileParser.java index 0552253..9ff94e1 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/FileParser.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/FileParser.java @@ -5,10 +5,8 @@ import kr.jongwonlee.fmg.proc.data.control.Nothing; import kr.jongwonlee.fmg.proc.data.control.Then; import kr.jongwonlee.fmg.util.GameAlert; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/control/ConditionOperator.java b/src/main/java/kr/jongwonlee/fmg/proc/data/control/ConditionOperator.java index 1740267..a5f71aa 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/control/ConditionOperator.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/control/ConditionOperator.java @@ -2,7 +2,6 @@ import kr.jongwonlee.fmg.proc.ProcType; import kr.jongwonlee.fmg.proc.Process; -import org.bukkit.Bukkit; public abstract class ConditionOperator implements Process { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/control/DoubleQuotation.java b/src/main/java/kr/jongwonlee/fmg/proc/data/control/DoubleQuotation.java index f36149b..cc3d7ea 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/control/DoubleQuotation.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/control/DoubleQuotation.java @@ -1,8 +1,8 @@ package kr.jongwonlee.fmg.proc.data.control; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; @Processable(alias = "\"") public class DoubleQuotation implements Process { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/control/Nothing.java b/src/main/java/kr/jongwonlee/fmg/proc/data/control/Nothing.java index 4bbcbe3..4669fda 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/control/Nothing.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/control/Nothing.java @@ -3,8 +3,6 @@ import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; @Processable(alias = "NOTHING") //must be capital letter to prevent notice public class Nothing implements Process { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/control/Remainder.java b/src/main/java/kr/jongwonlee/fmg/proc/data/control/Remainder.java index 1e27a4c..8c82507 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/control/Remainder.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/control/Remainder.java @@ -4,8 +4,6 @@ import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; -import java.util.function.BiConsumer; - @Processable(alias = {"%"}) public class Remainder implements MathOperator { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/control/SmallFrontBrace.java b/src/main/java/kr/jongwonlee/fmg/proc/data/control/SmallFrontBrace.java index f44513b..12e1634 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/control/SmallFrontBrace.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/control/SmallFrontBrace.java @@ -3,12 +3,10 @@ import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; -import org.bukkit.Bukkit; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; @Processable(alias = {"("}) public class SmallFrontBrace implements FrontBrace { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/control/Target.java b/src/main/java/kr/jongwonlee/fmg/proc/data/control/Target.java index ec92d01..898cc91 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/control/Target.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/control/Target.java @@ -3,6 +3,7 @@ import com.eatthepath.uuid.FastUUID; import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.game.GameData; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -55,7 +56,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { List list = null; if (process.getType() == ProcType.EXECUTE_GAME) list = miniGame.getGameData().getList(name); else if (process.getType() == ProcType.EXECUTE_ONLINE) list = GameDataStore.getInst().getList(name); - else if (originPlayer != null) list = GameDataStore.getPlayerData(originPlayer.getUniqueId()).getList(name); + else if (originPlayer != null) list = GameStore.getPlayerData(originPlayer.getUniqueId()).getList(name); Process proc2 = processList.get(2); String value2 = proc2.run(miniGame, procUnit); Process lastProc = frontBrace.getLastProc(); @@ -76,7 +77,7 @@ else if (proc2.getType() == ProcType.EXECUTE_ONLINE) { } } else if (originPlayer != null) { - GameData playerData = GameDataStore.getPlayerData(originPlayer.getUniqueId()); + GameData playerData = GameStore.getPlayerData(originPlayer.getUniqueId()); if (list != null) { for (String e : new ArrayList<>(list)) { playerData.setData(value2, e); @@ -91,7 +92,7 @@ else if (originPlayer != null) { List list = null; if (process.getType() == ProcType.EXECUTE_GAME) list = miniGame.getGameData().getList(name); else if (process.getType() == ProcType.EXECUTE_ONLINE) list = GameDataStore.getInst().getList(name); - else if (originPlayer != null) list = GameDataStore.getPlayerData(originPlayer.getUniqueId()).getList(name); + else if (originPlayer != null) list = GameStore.getPlayerData(originPlayer.getUniqueId()).getList(name); Process lastProc = frontBrace.getLastProc(); if (list != null) new ArrayList<>(list).forEach(element -> { try { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/CancelTask.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/CancelTask.java index 7c6f677..9df4aca 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/CancelTask.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/CancelTask.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -24,7 +25,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { Bukkit.getScheduler().cancelTask(taskId); miniGame.getGameData().removeTaskId(taskId); GameDataStore.getInst().removeTaskId(taskId); - GameDataStore.getPlayerData(procUnit.target.player.getUniqueId()).removeTaskId(taskId); + GameStore.getPlayerData(procUnit.target.player.getUniqueId()).removeTaskId(taskId); } catch (Exception ignored) { } return ""; } diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Data.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Data.java index b20ccc9..d774bdd 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Data.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Data.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -46,12 +47,12 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { String value = processList.get(2).run(miniGame, procUnit); if (isGame) miniGame.getGameData().setData(name, value); else if (isOnline) GameDataStore.getInst().setData(name, value); - else if (procUnit.target.player != null) GameDataStore.getPlayerData(procUnit.target.player.getUniqueId()).setData(name, value); + else if (procUnit.target.player != null) GameStore.getPlayerData(procUnit.target.player.getUniqueId()).setData(name, value); return value + frontBrace.getLastProc().run(miniGame, procUnit); } else { if (isGame) return miniGame.getGameData().getData(name) + frontBrace.getLastProc().run(miniGame, procUnit); else if (isOnline) return GameDataStore.getInst().getData(name) + frontBrace.getLastProc().run(miniGame, procUnit); - else if (procUnit.target.player != null) return GameDataStore.getPlayerData(procUnit.target.player.getUniqueId()).getData(name) + frontBrace.getLastProc().run(miniGame, procUnit); + else if (procUnit.target.player != null) return GameStore.getPlayerData(procUnit.target.player.getUniqueId()).getData(name) + frontBrace.getLastProc().run(miniGame, procUnit); } return frontBrace.getLastProc().run(miniGame, procUnit); } catch (Exception e) { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Delay.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Delay.java index 89e06c8..7821255 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Delay.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Delay.java @@ -1,7 +1,7 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.FMGPlugin; -import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -51,7 +51,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { if (isAsync) taskId = FMGPlugin.runTaskLaterAsync(runnable, ((long) Double.parseDouble(delay))); else taskId = FMGPlugin.runTaskLater(runnable, ((long) Double.parseDouble(delay))); if (isGame) miniGame.getGameData().addTaskId(taskId); - else if (!isOnline && player != null) GameDataStore.getPlayerData(player.getUniqueId()).addTaskId(taskId); + else if (!isOnline && player != null) GameStore.getPlayerData(player.getUniqueId()).addTaskId(taskId); procUnit2.setTaskId(taskId); return String.valueOf(taskId); } diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/List.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/List.java index ba7839a..971dfa7 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/List.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/List.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -66,7 +67,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { String value2 = proc2.run(miniGame, procUnit); if (proc2.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setList(value2, new ArrayList<>(list)); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setList(value2, new ArrayList<>(list)); - else GameDataStore.getPlayerData(player.getUniqueId()).setList(value2, new ArrayList<>(list)); + else GameStore.getPlayerData(player.getUniqueId()).setList(value2, new ArrayList<>(list)); } else if (isContains) return list == null ? "false" : list.contains(processList.get(2).run(miniGame, procUnit)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); else if (isSize) return list == null ? "0" : list.size() + frontBrace.getLastProc().run(miniGame, procUnit); else if (isShuffle) Collections.shuffle(list); @@ -103,7 +104,7 @@ else if (isClear && list != null) { String value2 = proc2.run(miniGame, procUnit); if (proc2.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setList(value2, new ArrayList<>(list)); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setList(value2, new ArrayList<>(list)); - else GameDataStore.getPlayerData(player.getUniqueId()).setList(value2, new ArrayList<>(list)); + else GameStore.getPlayerData(player.getUniqueId()).setList(value2, new ArrayList<>(list)); } else if (isContains) return list == null ? "false" : list.contains(processList.get(2).run(miniGame, procUnit)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); else if (isSize) return list == null ? "0" : list.size() + frontBrace.getLastProc().run(miniGame, procUnit); else if (isShuffle) Collections.shuffle(list); @@ -134,24 +135,24 @@ else if (isClear && list != null) { } } } else if (player != null) { - java.util.List list = GameDataStore.getPlayerData(player.getUniqueId()).getList(name); + java.util.List list = GameStore.getPlayerData(player.getUniqueId()).getList(name); if (isClone) { Process proc2 = processList.get(2); String value2 = proc2.run(miniGame, procUnit); if (proc2.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setList(value2, new ArrayList<>(list)); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setList(value2, new ArrayList<>(list)); - else GameDataStore.getPlayerData(player.getUniqueId()).setList(value2, new ArrayList<>(list)); + else GameStore.getPlayerData(player.getUniqueId()).setList(value2, new ArrayList<>(list)); } else if (isContains) return list == null ? "false" : list.contains(processList.get(2).run(miniGame, procUnit)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); else if (isSize) return list == null ? "0" : list.size() + frontBrace.getLastProc().run(miniGame, procUnit); else if (isShuffle) Collections.shuffle(list); else if (isClear && list != null) { - GameDataStore.getPlayerData(player.getUniqueId()).setList(name, null); + GameStore.getPlayerData(player.getUniqueId()).setList(name, null); return frontBrace.getLastProc().run(miniGame, procUnit); } else { if (isAdd) { if (list == null) { list = new ArrayList<>(); - GameDataStore.getPlayerData(player.getUniqueId()).setList(name, list); + GameStore.getPlayerData(player.getUniqueId()).setList(name, list); } String value = processList.get(2).run(miniGame, procUnit); list.add(value); diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Repeat.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Repeat.java index b956237..05f0869 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Repeat.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Repeat.java @@ -1,7 +1,7 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.FMGPlugin; -import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -49,7 +49,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { Runnable runnable = () -> frontBrace.getLastProc().run(miniGame, procUnit2); taskId = FMGPlugin.runTaskRepeatSync(runnable, ((long) Double.parseDouble(delay)), ((long) Double.parseDouble(period))); if (isGame) miniGame.getGameData().addTaskId(taskId); - else if (!isOnline && player != null) GameDataStore.getPlayerData(player.getUniqueId()).addTaskId(taskId); + else if (!isOnline && player != null) GameStore.getPlayerData(player.getUniqueId()).addTaskId(taskId); procUnit2.setTaskId(taskId); return String.valueOf(taskId); } diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Split.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Split.java index 91268dc..f5e087b 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Split.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/Split.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -33,7 +34,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { String value3 = process3.run(miniGame, procUnit); if (process3.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setList(value3, strings); else if (process3.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setList(value3, strings); - else GameDataStore.getPlayerData(procUnit.target.player.getUniqueId()).setList(value3, strings); + else GameStore.getPlayerData(procUnit.target.player.getUniqueId()).setList(value3, strings); return ""; } catch (Exception ignored) { return ""; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/TaskId.java b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/TaskId.java index a744449..a267059 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/etc/TaskId.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/etc/TaskId.java @@ -1,8 +1,8 @@ package kr.jongwonlee.fmg.proc.data.etc; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; @Processable(alias = "taskid") public class TaskId implements Process { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/ActionBar.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/ActionBar.java index 433de09..9e6fa45 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/ActionBar.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/ActionBar.java @@ -1,6 +1,5 @@ package kr.jongwonlee.fmg.proc.data.minecraft; -import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Block.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Block.java index 9f46d2b..6e9a2a0 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Block.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Block.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -65,7 +66,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { String value = process.run(miniGame, procUnit); org.bukkit.block.Block targetBlock; if (process.getType() == ProcType.EXECUTE_GAME) targetBlock = miniGame.getGameData().getBlock(value).getBlock(); - else targetBlock = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(value).getBlock(); + else targetBlock = GameStore.getPlayerData(player.getUniqueId()).getBlock(value).getBlock(); targetBlock.setType(block.getType()); targetBlock.setData(block.getRawData()); } else if (isLocation) { @@ -76,7 +77,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { String targetLocation = process.run(miniGame, procUnit); if (isGameLocation) miniGame.getGameData().setLocation(targetLocation, block.getLocation().clone()); else if (isAllLocation) GameDataStore.getInst().setLocation(targetLocation, block.getLocation().clone()); - else if (player != null) GameDataStore.getPlayerData(player.getUniqueId()).setLocation(targetLocation, block.getLocation().clone()); + else if (player != null) GameStore.getPlayerData(player.getUniqueId()).setLocation(targetLocation, block.getLocation().clone()); } else if (isCode) { BlockState block = miniGame.getGameData().getBlock(name); return block.getTypeId() + ":" + block.getRawData() + frontBrace.getLastProc().run(miniGame, procUnit); @@ -111,36 +112,36 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { if (location == null) return frontBrace.getLastProc().run(miniGame, procUnit); miniGame.getGameData().setBlock(name, location.getBlock().getState()); } else { - Location location = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + Location location = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); if (location == null) return frontBrace.getLastProc().run(miniGame, procUnit); miniGame.getGameData().setBlock(name, location.getBlock().getState()); } } } else if (player != null) { if (isRemove) { - GameDataStore.getPlayerData(player.getUniqueId()).setBlock(name, null); + GameStore.getPlayerData(player.getUniqueId()).setBlock(name, null); } else if (isClone) { - BlockState block = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(name); + BlockState block = GameStore.getPlayerData(player.getUniqueId()).getBlock(name); Process process = processList.get(2); String value = process.run(miniGame, procUnit); BlockState targetBlock; if (process.getType() == ProcType.EXECUTE_GAME) targetBlock = miniGame.getGameData().getBlock(value); - else targetBlock = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(value); + else targetBlock = GameStore.getPlayerData(player.getUniqueId()).getBlock(value); targetBlock.setData(block.getData()); } else if (isLocation) { - BlockState block = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(name); + BlockState block = GameStore.getPlayerData(player.getUniqueId()).getBlock(name); Process process = processList.get(2); boolean isGameLocation = process.getType() == ProcType.EXECUTE_GAME; boolean isAllLocation = process.getType() == ProcType.EXECUTE_ONLINE; String targetLocation = process.run(miniGame, procUnit); if (isGameLocation) miniGame.getGameData().setLocation(targetLocation, block.getLocation().clone()); else if (isAllLocation) GameDataStore.getInst().setLocation(targetLocation, block.getLocation().clone()); - else GameDataStore.getPlayerData(player.getUniqueId()).setLocation(targetLocation, block.getLocation().clone()); + else GameStore.getPlayerData(player.getUniqueId()).setLocation(targetLocation, block.getLocation().clone()); } else if (isCode) { - BlockState block = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(name); + BlockState block = GameStore.getPlayerData(player.getUniqueId()).getBlock(name); return block.getTypeId() + ":" + block.getRawData() + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isType) { - BlockState block = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(name); + BlockState block = GameStore.getPlayerData(player.getUniqueId()).getBlock(name); return block.getType().name() + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isSet) { Process process = processList.get(2); @@ -150,7 +151,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { String value = process.run(miniGame, procUnit); if (isCode) { int typeId = Integer.parseInt(value); - org.bukkit.block.Block block = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(name).getBlock(); + org.bukkit.block.Block block = GameStore.getPlayerData(player.getUniqueId()).getBlock(name).getBlock(); block.setTypeId(typeId); try { Process proc2 = processList.get(4); @@ -160,20 +161,20 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { } catch (Exception ignored) { } } else if (isType) { - org.bukkit.block.Block block = GameDataStore.getPlayerData(player.getUniqueId()).getBlock(name).getBlock(); + org.bukkit.block.Block block = GameStore.getPlayerData(player.getUniqueId()).getBlock(name).getBlock(); block.setType(Material.getMaterial(value)); } else if (isGameLocation) { Location location = miniGame.getGameData().getLocation(value); if (location == null) return frontBrace.getLastProc().run(miniGame, procUnit); - GameDataStore.getPlayerData(player.getUniqueId()).setBlock(name, location.getBlock().getState()); + GameStore.getPlayerData(player.getUniqueId()).setBlock(name, location.getBlock().getState()); } else if (isAllLocation) { Location location = GameDataStore.getInst().getLocation(value); if (location == null) return frontBrace.getLastProc().run(miniGame, procUnit); - GameDataStore.getPlayerData(player.getUniqueId()).setBlock(name, location.getBlock().getState()); + GameStore.getPlayerData(player.getUniqueId()).setBlock(name, location.getBlock().getState()); } else { - Location location = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + Location location = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); if (location == null) return frontBrace.getLastProc().run(miniGame, procUnit); - GameDataStore.getPlayerData(player.getUniqueId()).setBlock(name, location.getBlock().getState()); + GameStore.getPlayerData(player.getUniqueId()).setBlock(name, location.getBlock().getState()); } } diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/BossBar.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/BossBar.java index 244bd0c..67f69aa 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/BossBar.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/BossBar.java @@ -1,9 +1,9 @@ package kr.jongwonlee.fmg.proc.data.minecraft; -import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; import org.bukkit.Bukkit; import org.bukkit.boss.BarColor; @@ -58,7 +58,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { if (isExists) { org.bukkit.boss.BossBar bossBar; if (isGame) bossBar = miniGame.getGameData().getBossBar(name); - else bossBar = GameDataStore.getPlayerData(player.getUniqueId()).getBossBar(name); + else bossBar = GameStore.getPlayerData(player.getUniqueId()).getBossBar(name); return ( bossBar != null ? "true" : "false" ) + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isRemove) { @@ -67,19 +67,19 @@ else if (isRemove) { bossBar = miniGame.getGameData().getBossBar(name); miniGame.getGameData().setBossBar(name, null); } else { - bossBar = GameDataStore.getPlayerData(player.getUniqueId()).getBossBar(name); - GameDataStore.getPlayerData(player.getUniqueId()).setBossBar(name, null); + bossBar = GameStore.getPlayerData(player.getUniqueId()).getBossBar(name); + GameStore.getPlayerData(player.getUniqueId()).setBossBar(name, null); } bossBar.removeAll(); } else if (isClose) { org.bukkit.boss.BossBar bossBar; if (isGame) bossBar = miniGame.getGameData().getBossBar(name); - else bossBar = GameDataStore.getPlayerData(player.getUniqueId()).getBossBar(name); + else bossBar = GameStore.getPlayerData(player.getUniqueId()).getBossBar(name); bossBar.removePlayer(player); } else if (isOpen) { org.bukkit.boss.BossBar bossBar; if (isGame) bossBar = miniGame.getGameData().getBossBar(name); - else bossBar = GameDataStore.getPlayerData(player.getUniqueId()).getBossBar(name); + else bossBar = GameStore.getPlayerData(player.getUniqueId()).getBossBar(name); bossBar.addPlayer(player); } else if (isCreate) { { @@ -88,8 +88,8 @@ else if (isRemove) { bossBar = miniGame.getGameData().getBossBar(name); miniGame.getGameData().setBossBar(name, null); } else { - bossBar = GameDataStore.getPlayerData(player.getUniqueId()).getBossBar(name); - GameDataStore.getPlayerData(player.getUniqueId()).setBossBar(name, null); + bossBar = GameStore.getPlayerData(player.getUniqueId()).getBossBar(name); + GameStore.getPlayerData(player.getUniqueId()).setBossBar(name, null); } if (bossBar != null) bossBar.removeAll(); } @@ -120,13 +120,13 @@ else if (isRemove) { } org.bukkit.boss.BossBar bossBar = Bukkit.createBossBar("", BarColor.valueOf(value2), barStyle); if (isGame) miniGame.getGameData().setBossBar(name, bossBar); - else GameDataStore.getPlayerData(player.getUniqueId()).setBossBar(name, bossBar); + else GameStore.getPlayerData(player.getUniqueId()).setBossBar(name, bossBar); } else if (isSet) { Process proc2 = processList.get(2); String value2 = proc2.run(miniGame, procUnit); org.bukkit.boss.BossBar bossBar; if (isGame) bossBar = miniGame.getGameData().getBossBar(name); - else bossBar = GameDataStore.getPlayerData(player.getUniqueId()).getBossBar(name); + else bossBar = GameStore.getPlayerData(player.getUniqueId()).getBossBar(name); if (isColor) bossBar.setColor(BarColor.valueOf(value2)); else if (isType) { BarStyle barStyle; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Flying.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Flying.java index 83ad593..a49f5de 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Flying.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Flying.java @@ -1,8 +1,8 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; import org.bukkit.entity.Player; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Hide.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Hide.java index 6e473ba..594102d 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Hide.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Hide.java @@ -2,8 +2,8 @@ import kr.jongwonlee.fmg.FMGPlugin; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Inventory.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Inventory.java index cea7a4b..32f9136 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Inventory.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Inventory.java @@ -2,6 +2,7 @@ import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.game.GameData; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -96,7 +97,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { GameData gameData = GameDataStore.getInst(); gameData.setItemStack(value, Item.clone(inventory.getItem(index))); } else if (player != null) { - GameData gameData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData gameData = GameStore.getPlayerData(player.getUniqueId()); gameData.setItemStack(value, Item.clone(inventory.getItem(index))); } } else if (isRemove) GameDataStore.getInst().setInventory(name, null); @@ -121,7 +122,7 @@ else if (isClear) { GameData gameData = miniGame.getGameData(); return inventory.equals(gameData.getInventory(value)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); } else if (player != null) { - GameData gameData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData gameData = GameStore.getPlayerData(player.getUniqueId()); return inventory.equals(gameData.getInventory(value)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); } } else if (isClone) { @@ -134,7 +135,7 @@ else if (isClear) { if (isOnlineInventory) gameData = GameDataStore.getInst(); else if (isGameInventory) gameData = miniGame.getGameData(); else if (isPlayerInventory) gameData = null; - else gameData = GameDataStore.getPlayerData(player.getUniqueId()); + else gameData = GameStore.getPlayerData(player.getUniqueId()); org.bukkit.inventory.Inventory inv; if (process.getType() == ProcType.EXECUTE_PLAYER) { inventory = player.getInventory(); @@ -184,7 +185,7 @@ else if (inventory.getType() != InventoryType.CHEST) ItemStack itemStack = GameDataStore.getInst().getItemStack(value); inventory.setItem(index, itemStack.clone()); } else if (player != null) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); inventory.setItem(index, itemStack.clone()); } } else if (isCreate) { @@ -223,7 +224,7 @@ else if (inventory.getType() != InventoryType.CHEST) GameData gameData = GameDataStore.getInst(); gameData.setItemStack(value, Item.clone(inventory.getItem(index))); } else if (player != null) { - GameData gameData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData gameData = GameStore.getPlayerData(player.getUniqueId()); gameData.setItemStack(value, Item.clone(inventory.getItem(index))); } } else if (isRemove) miniGame.getGameData().setInventory(name, null); @@ -248,7 +249,7 @@ else if (isClear) { GameData gameData = miniGame.getGameData(); return inventory.equals(gameData.getInventory(value)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); } else { - GameData gameData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData gameData = GameStore.getPlayerData(player.getUniqueId()); return inventory.equals(gameData.getInventory(value)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); } @@ -262,7 +263,7 @@ else if (isClear) { if (isOnlineInventory) gameData = GameDataStore.getInst(); else if (isGameInventory) gameData = miniGame.getGameData(); else if (isPlayerInventory) gameData = null; - else gameData = GameDataStore.getPlayerData(player.getUniqueId()); + else gameData = GameStore.getPlayerData(player.getUniqueId()); org.bukkit.inventory.Inventory inv; if (process.getType() == ProcType.EXECUTE_PLAYER) { inventory = player.getInventory(); @@ -312,7 +313,7 @@ else if (inventory.getType() != InventoryType.CHEST) ItemStack itemStack = GameDataStore.getInst().getItemStack(value); inventory.setItem(index, itemStack.clone()); } else if (player != null) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); inventory.setItem(index, itemStack.clone()); } } else if (isCreate) { @@ -331,7 +332,7 @@ else if (inventory.getType() != InventoryType.CHEST) if (player != null) player.openInventory(miniGame.getGameData().getInventory(name)); } } else if (player != null) { - org.bukkit.inventory.Inventory inventory = process.getType().equals(ProcType.EXECUTE_PLAYER) ? player.getInventory() : GameDataStore.getPlayerData(player.getUniqueId()).getInventory(name); + org.bukkit.inventory.Inventory inventory = process.getType().equals(ProcType.EXECUTE_PLAYER) ? player.getInventory() : GameStore.getPlayerData(player.getUniqueId()).getInventory(name); if (process.getType() == ProcType.EXECUTE_PLAYER) inventory = player.getInventory(); if (isItem) { Process proc1 = processList.get(2); @@ -351,10 +352,10 @@ else if (inventory.getType() != InventoryType.CHEST) GameData gameData = GameDataStore.getInst(); gameData.setItemStack(value, Item.clone(inventory.getItem(index))); } else { - GameData gameData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData gameData = GameStore.getPlayerData(player.getUniqueId()); gameData.setItemStack(value, Item.clone(inventory.getItem(index))); } - } else if (isRemove) GameDataStore.getPlayerData(player.getUniqueId()).setInventory(name, null); + } else if (isRemove) GameStore.getPlayerData(player.getUniqueId()).setInventory(name, null); else if (isClear) { inventory.clear(); return ""; @@ -376,7 +377,7 @@ else if (isClear) { GameData gameData = miniGame.getGameData(); return inventory.equals(gameData.getInventory(value)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); } else { - GameData gameData = GameDataStore.getPlayerData(player.getUniqueId()); + GameData gameData = GameStore.getPlayerData(player.getUniqueId()); return inventory.equals(gameData.getInventory(value)) ? "true" : "false" + frontBrace.getLastProc().run(miniGame, procUnit); } } else if (isClone) { @@ -389,7 +390,7 @@ else if (isClear) { if (isOnlineInventory) gameData = GameDataStore.getInst(); else if (isGameInventory) gameData = miniGame.getGameData(); else if (isPlayerInventory) gameData = null; - else gameData = GameDataStore.getPlayerData(player.getUniqueId()); + else gameData = GameStore.getPlayerData(player.getUniqueId()); org.bukkit.inventory.Inventory inv; if (process.getType() == ProcType.EXECUTE_PLAYER) { inventory = player.getInventory(); @@ -421,7 +422,7 @@ else if (inventory.getType() != InventoryType.CHEST) ItemStack itemStack = GameDataStore.getInst().getItemStack(value); inventory.addItem(itemStack.clone()); } else { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); inventory.addItem(itemStack.clone()); } } else if (isSet) { @@ -439,7 +440,7 @@ else if (inventory.getType() != InventoryType.CHEST) ItemStack itemStack = GameDataStore.getInst().getItemStack(value); inventory.setItem(index, itemStack.clone()); } else { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); inventory.setItem(index, itemStack.clone()); } } else if (isCreate) { @@ -448,14 +449,14 @@ else if (inventory.getType() != InventoryType.CHEST) int index = Integer.parseInt(proc); String title = processList.get(4).run(miniGame, procUnit); org.bukkit.inventory.Inventory inv = Bukkit.createInventory(null, index, title); - GameDataStore.getPlayerData(player.getUniqueId()).setInventory(name, inv); + GameStore.getPlayerData(player.getUniqueId()).setInventory(name, inv); } catch (Exception e) { String title = processList.get(4).run(miniGame, procUnit); org.bukkit.inventory.Inventory inv = Bukkit.createInventory(null, InventoryType.valueOf(proc), title); - GameDataStore.getPlayerData(player.getUniqueId()).setInventory(name, inv); + GameStore.getPlayerData(player.getUniqueId()).setInventory(name, inv); } } else if (isOpen) { - player.openInventory(GameDataStore.getPlayerData(player.getUniqueId()).getInventory(name)); + player.openInventory(GameStore.getPlayerData(player.getUniqueId()).getInventory(name)); } } } catch (Exception e) { diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Item.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Item.java index bf4c901..f598bdc 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Item.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Item.java @@ -2,6 +2,7 @@ import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.game.GameData; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -89,7 +90,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { ItemStack itemStack2; if (proc2.getType() == ProcType.EXECUTE_GAME) itemStack2 = miniGame.getGameData().getItemStack(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) itemStack2 = GameDataStore.getInst().getItemStack(value2); - else itemStack2 = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value2); + else itemStack2 = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value2); return itemStack == null ? "false" : itemStack.isSimilar(itemStack2) ? "false" : "true" + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isExists) { ItemStack itemStack = miniGame.getGameData().getItemStack(name); @@ -171,7 +172,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { ItemStack itemStack = GameDataStore.getInst().getItemStack(value); miniGame.getGameData().setItemStack(name, cloneItemStack(itemStack)); } else if (player != null) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); miniGame.getGameData().setItemStack(name, cloneItemStack(itemStack)); } } @@ -209,7 +210,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { ItemStack itemStack2; if (proc2.getType() == ProcType.EXECUTE_GAME) itemStack2 = miniGame.getGameData().getItemStack(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) itemStack2 = GameDataStore.getInst().getItemStack(value2); - else itemStack2 = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value2); + else itemStack2 = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value2); return itemStack == null ? "false" : itemStack.isSimilar(itemStack2) ? "false" : "true" + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isExists) { ItemStack itemStack = GameDataStore.getInst().getItemStack(name); @@ -291,7 +292,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { ItemStack itemStack = GameDataStore.getInst().getItemStack(value); GameDataStore.getInst().setItemStack(name, cloneItemStack(itemStack)); } else if (player != null) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); GameDataStore.getInst().setItemStack(name, cloneItemStack(itemStack)); } } @@ -320,24 +321,24 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { } } else if (player != null) { if (isCode) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); return itemStack == null || itemStack.getType() == Material.AIR ? "0:0" : itemStack.getTypeId() + ":" + itemStack.getData().getData(); } else if (isEquals) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); Process proc2 = processList.get(2); String value2 = proc2.run(miniGame, procUnit); ItemStack itemStack2; if (proc2.getType() == ProcType.EXECUTE_GAME) itemStack2 = miniGame.getGameData().getItemStack(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) itemStack2 = GameDataStore.getInst().getItemStack(value2); - else itemStack2 = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value2); + else itemStack2 = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value2); return itemStack == null ? "false" : itemStack.isSimilar(itemStack2) ? "false" : "true" + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isExists) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); return itemStack == null ? "false" : "true" + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isAdd) { if (isLore) { String value = processList.get(2).run(miniGame, procUnit); - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); if (isExist(itemStack)) { ItemMeta itemMeta = itemStack.getItemMeta(); if (itemMeta == null) itemMeta = Bukkit.getItemFactory().getItemMeta(itemStack.getType()); @@ -348,16 +349,16 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { itemStack.setItemMeta(itemMeta); } } else { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); player.getInventory().addItem(cloneItemStack(itemStack)); } } else if (isSet) { if (isSize) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); itemStack.setAmount(Integer.parseInt(processList.get(2).run(miniGame, procUnit))); } else if (isName) { String value = processList.get(2).run(miniGame, procUnit); - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); if (isExist(itemStack)) { ItemMeta itemMeta = itemStack.getItemMeta(); if (itemMeta == null) itemMeta = Bukkit.getItemFactory().getItemMeta(itemStack.getType()); @@ -367,7 +368,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { } else if (isLore) { int line = Integer.parseInt(processList.get(2).run(miniGame, procUnit)); String value = processList.get(4).run(miniGame, procUnit); - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); if (isExist(itemStack)) { ItemMeta itemMeta = itemStack.getItemMeta(); if (itemMeta == null) itemMeta = Bukkit.getItemFactory().getItemMeta(itemStack.getType()); @@ -388,41 +389,41 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { boolean isPlayerItemStack = process.getType() == ProcType.EXECUTE_PLAYER; if (isPlayerItemStack) { ItemStack itemStack = player.getInventory().getItem(Integer.parseInt(value)); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } else if (isCodeItemStack) { try { byte damage = Byte.parseByte(processList.get(4).run(miniGame, procUnit)); ItemStack itemStack = new ItemStack(Material.getMaterial(Integer.parseInt(value)), 1, damage); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } catch (Exception ignored) { ItemStack itemStack = new ItemStack(Material.getMaterial(Integer.parseInt(value))); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } } else if (isTypeItemStack) { ItemStack itemStack = new ItemStack(Material.getMaterial(value)); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } else if (isGameItemStack){ GameData gameData = miniGame.getGameData(); ItemStack itemStack = gameData.getItemStack(value); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } else if (isAllItemStack) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } else { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(value); - GameDataStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(value); + GameStore.getPlayerData(player.getUniqueId()).setItemStack(name, cloneItemStack(itemStack)); } } } else if (isSize) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); return itemStack.getAmount() + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isType) { - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); return itemStack.getType().name() + frontBrace.getLastProc().run(miniGame, procUnit); } else if (isRemove) { if (isLore) { int line = Integer.parseInt(processList.get(2).run(miniGame, procUnit)); - ItemStack itemStack = GameDataStore.getPlayerData(player.getUniqueId()).getItemStack(name); + ItemStack itemStack = GameStore.getPlayerData(player.getUniqueId()).getItemStack(name); if (isExist(itemStack)) { ItemMeta itemMeta = itemStack.getItemMeta(); if (itemMeta == null) itemMeta = Bukkit.getItemFactory().getItemMeta(itemStack.getType()); diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Location.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Location.java index 3e5793e..c0e0077 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Location.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Location.java @@ -1,11 +1,11 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; -import net.jafama.FastMath; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; @@ -87,7 +87,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { Process proc1 = processList.get(2); String value = proc1.run(miniGame, procUnit); if (proc1.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setBlock(value, location.getBlock().getState()); - else GameDataStore.getPlayerData(player.getUniqueId()).setBlock(value, location.getBlock().getState()); + else GameStore.getPlayerData(player.getUniqueId()).setBlock(value, location.getBlock().getState()); } else if (isExists) return location == null ? "false" : "true"; else if (isSet) { double value = Double.parseDouble(processList.get(2).run(miniGame, procUnit)); @@ -117,7 +117,7 @@ else if (isCreate) { String value = proc.run(miniGame, procUnit); if (proc.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setLocation(value, location.clone()); else if (proc.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setLocation(value, location.clone()); - else if (player != null) GameDataStore.getPlayerData(player.getUniqueId()).setLocation(value, location.clone()); + else if (player != null) GameStore.getPlayerData(player.getUniqueId()).setLocation(value, location.clone()); } else if (isAdd) { double posX = Double.parseDouble(processList.get(2).run(miniGame, procUnit)); double posY = Double.parseDouble(processList.get(4).run(miniGame, procUnit)); @@ -129,13 +129,13 @@ else if (isCreate) { org.bukkit.Location pos1; if (proc1.getType() == ProcType.EXECUTE_GAME) pos1 = miniGame.getGameData().getLocation(value); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) pos1 = GameDataStore.getInst().getLocation(value); - else pos1 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + else pos1 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); Process proc2 = processList.get(4); String value2 = proc2.run(miniGame, procUnit); org.bukkit.Location pos2; if (proc2.getType() == ProcType.EXECUTE_GAME) pos2 = miniGame.getGameData().getLocation(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) pos2 = GameDataStore.getInst().getLocation(value2); - else pos2 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value2); + else pos2 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value2); if (location.getWorld() != pos1.getWorld() || pos1.getWorld() != pos2.getWorld()) return "false"; Vector min = Vector.getMinimum(pos1.toVector(), pos2.toVector()); Vector max = Vector.getMaximum(pos1.toVector(), pos2.toVector()); @@ -146,7 +146,7 @@ else if (isCreate) { org.bukkit.Location pos1; if (proc1.getType() == ProcType.EXECUTE_GAME) pos1 = miniGame.getGameData().getLocation(value); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) pos1 = GameDataStore.getInst().getLocation(value); - else pos1 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + else pos1 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); return location.equals(pos1) ? "true" : "false"; } } else if (isGame) { @@ -156,7 +156,7 @@ else if (isCreate) { Process proc1 = processList.get(2); String value = proc1.run(miniGame, procUnit); if (proc1.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setBlock(value, location.getBlock().getState()); - else GameDataStore.getPlayerData(player.getUniqueId()).setBlock(value, location.getBlock().getState()); + else GameStore.getPlayerData(player.getUniqueId()).setBlock(value, location.getBlock().getState()); } else if (isExists) return location == null ? "false" : "true"; else if (isSet) { double value = Double.parseDouble(processList.get(2).run(miniGame, procUnit)); @@ -186,7 +186,7 @@ else if (isCreate) { String value = proc.run(miniGame, procUnit); if (proc.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setLocation(value, location.clone()); else if (proc.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setLocation(value, location.clone()); - else if (player != null) GameDataStore.getPlayerData(player.getUniqueId()).setLocation(value, location.clone()); + else if (player != null) GameStore.getPlayerData(player.getUniqueId()).setLocation(value, location.clone()); } else if (isAdd) { double posX = Double.parseDouble(processList.get(2).run(miniGame, procUnit)); double posY = Double.parseDouble(processList.get(4).run(miniGame, procUnit)); @@ -198,13 +198,13 @@ else if (isCreate) { org.bukkit.Location pos1; if (proc1.getType() == ProcType.EXECUTE_GAME) pos1 = miniGame.getGameData().getLocation(value); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) pos1 = GameDataStore.getInst().getLocation(value); - else pos1 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + else pos1 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); Process proc2 = processList.get(4); String value2 = proc2.run(miniGame, procUnit); org.bukkit.Location pos2; if (proc2.getType() == ProcType.EXECUTE_GAME) pos2 = miniGame.getGameData().getLocation(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) pos2 = GameDataStore.getInst().getLocation(value2); - else pos2 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value2); + else pos2 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value2); if (location.getWorld() != pos1.getWorld() || pos1.getWorld() != pos2.getWorld()) return "false"; Vector min = Vector.getMinimum(pos1.toVector(), pos2.toVector()); Vector max = Vector.getMaximum(pos1.toVector(), pos2.toVector()); @@ -215,17 +215,17 @@ else if (isCreate) { org.bukkit.Location pos1; if (proc1.getType() == ProcType.EXECUTE_GAME) pos1 = miniGame.getGameData().getLocation(value); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) pos1 = GameDataStore.getInst().getLocation(value); - else pos1 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + else pos1 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); return location.equals(pos1) ? "true" : "false"; } } else if (player != null) { org.bukkit.Location location = process.getType() == ProcType.EXECUTE_ENTITY ? procUnit.target.entity.getLocation() - : process.getType() == ProcType.EXECUTE_PLAYER ? player.getLocation() : GameDataStore.getPlayerData(player.getUniqueId()).getLocation(name); + : process.getType() == ProcType.EXECUTE_PLAYER ? player.getLocation() : GameStore.getPlayerData(player.getUniqueId()).getLocation(name); if (isBlock) { Process proc1 = processList.get(2); String value = proc1.run(miniGame, procUnit); if (proc1.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setBlock(value, location.getBlock().getState()); - else GameDataStore.getPlayerData(player.getUniqueId()).setBlock(value, location.getBlock().getState()); + else GameStore.getPlayerData(player.getUniqueId()).setBlock(value, location.getBlock().getState()); } else if (isExists) return location == null ? "false" : "true"; else if (isSet) { double value = Double.parseDouble(processList.get(2).run(miniGame, procUnit)); @@ -235,7 +235,7 @@ else if (isSet) { else if (isPosYaw) location.setYaw((float) value); else if (isPosPitch) location.setPitch((float) value); } - else if (isRemove) GameDataStore.getPlayerData(player.getUniqueId()).setLocation(name, null); + else if (isRemove) GameStore.getPlayerData(player.getUniqueId()).setLocation(name, null); else if (isPosX) return location.getX() + frontBrace.getLastProc().run(miniGame, procUnit); else if (isPosY) return location.getY() + frontBrace.getLastProc().run(miniGame, procUnit); else if (isPosZ) return location.getZ() + frontBrace.getLastProc().run(miniGame, procUnit); @@ -249,13 +249,13 @@ else if (isCreate) { boolean hasDirection = processList.size() >= 12; float yaw = !hasDirection ? 0 : (float) Double.parseDouble(processList.get(10).run(miniGame, procUnit)); float pitch = !hasDirection ? 0 : (float) Double.parseDouble(processList.get(12).run(miniGame, procUnit)); - GameDataStore.getPlayerData(player.getUniqueId()).setLocation(name, new org.bukkit.Location(world, posX, posY, posZ, yaw, pitch)); + GameStore.getPlayerData(player.getUniqueId()).setLocation(name, new org.bukkit.Location(world, posX, posY, posZ, yaw, pitch)); } else if (isClone) { Process proc = processList.get(2); String value = proc.run(miniGame, procUnit); if (proc.getType() == ProcType.EXECUTE_GAME) miniGame.getGameData().setLocation(value, location.clone()); else if (proc.getType() == ProcType.EXECUTE_ONLINE) GameDataStore.getInst().setLocation(value, location.clone()); - else GameDataStore.getPlayerData(player.getUniqueId()).setLocation(value, location.clone()); + else GameStore.getPlayerData(player.getUniqueId()).setLocation(value, location.clone()); } else if (isAdd) { double posX = Double.parseDouble(processList.get(2).run(miniGame, procUnit)); double posY = Double.parseDouble(processList.get(4).run(miniGame, procUnit)); @@ -267,13 +267,13 @@ else if (isCreate) { org.bukkit.Location pos1; if (proc1.getType() == ProcType.EXECUTE_GAME) pos1 = miniGame.getGameData().getLocation(value); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) pos1 = GameDataStore.getInst().getLocation(value); - else pos1 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + else pos1 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); Process proc2 = processList.get(4); String value2 = proc2.run(miniGame, procUnit); org.bukkit.Location pos2; if (proc2.getType() == ProcType.EXECUTE_GAME) pos2 = miniGame.getGameData().getLocation(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) pos2 = GameDataStore.getInst().getLocation(value2); - else pos2 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value2); + else pos2 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value2); if (location.getWorld() != pos1.getWorld() || pos1.getWorld() != pos2.getWorld()) return "false"; Vector min = Vector.getMinimum(pos1.toVector(), pos2.toVector()); Vector max = Vector.getMaximum(pos1.toVector(), pos2.toVector()); @@ -284,7 +284,7 @@ else if (isCreate) { org.bukkit.Location pos1; if (proc1.getType() == ProcType.EXECUTE_GAME) pos1 = miniGame.getGameData().getLocation(value); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) pos1 = GameDataStore.getInst().getLocation(value); - else pos1 = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value); + else pos1 = GameStore.getPlayerData(player.getUniqueId()).getLocation(value); return location.equals(pos1) ? "true" : "false"; } } diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/NearByEntities.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/NearByEntities.java index 067dd3b..1d730ce 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/NearByEntities.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/NearByEntities.java @@ -1,8 +1,8 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; import org.bukkit.entity.Entity; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Particle.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Particle.java index 4364ee0..3ea2903 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Particle.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Particle.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -35,7 +36,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { if (proc1.getType() == ProcType.EXECUTE_GAME) location = miniGame.getGameData().getLocation(value1); else if (proc1.getType() == ProcType.EXECUTE_ONLINE) location = GameDataStore.getInst().getLocation(value1); else if (proc1.getType() == ProcType.EXECUTE_PLAYER) location = player.getLocation(); - else location = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value1); + else location = GameStore.getPlayerData(player.getUniqueId()).getLocation(value1); Process proc2 = processList.get(2); String value2 = proc2.run(miniGame, procUnit); Process proc3 = processList.get(4); diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Sound.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Sound.java index 18313a0..bcebc16 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Sound.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Sound.java @@ -1,6 +1,5 @@ package kr.jongwonlee.fmg.proc.data.minecraft; -import kr.jongwonlee.fmg.conf.GameDataStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Spawn.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Spawn.java index d9568f2..6b16d4f 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Spawn.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Spawn.java @@ -2,9 +2,10 @@ import com.eatthepath.uuid.FastUUID; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; import org.bukkit.Location; import org.bukkit.entity.Entity; @@ -45,7 +46,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { if (proc2.getType() == ProcType.EXECUTE_GAME) location = miniGame.getGameData().getLocation(value2); else if (proc2.getType() == ProcType.EXECUTE_ONLINE) location = GameDataStore.getInst().getLocation(value2); else if (proc2.getType() == ProcType.EXECUTE_PLAYER) location = player.getLocation(); - else location = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(value2); + else location = GameStore.getPlayerData(player.getUniqueId()).getLocation(value2); Entity entity = location.getWorld().spawn(location, EntityType.valueOf(value1).getEntityClass(), e -> { Entity origin = procUnit.target.entity; procUnit.target.entity = e; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Teleport.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Teleport.java index ba3ea0a..915f1e1 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Teleport.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Teleport.java @@ -1,6 +1,7 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.conf.GameDataStore; +import kr.jongwonlee.fmg.game.GameStore; import kr.jongwonlee.fmg.game.MiniGame; import kr.jongwonlee.fmg.proc.Process; import kr.jongwonlee.fmg.proc.*; @@ -38,7 +39,7 @@ public String run(MiniGame miniGame, ProcUnit procUnit) { Location location; if (isOnline) location = GameDataStore.getInst().getLocation(message); else if (isGame) location = miniGame.getGameData().getLocation(message); - else location = GameDataStore.getPlayerData(player.getUniqueId()).getLocation(message); + else location = GameStore.getPlayerData(player.getUniqueId()).getLocation(message); if (location != null) player.teleport(location); } /*else { Entity entity = procUnit.target.entity; diff --git a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Velocity.java b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Velocity.java index 05a0e27..d4ae4e1 100644 --- a/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Velocity.java +++ b/src/main/java/kr/jongwonlee/fmg/proc/data/minecraft/Velocity.java @@ -1,11 +1,10 @@ package kr.jongwonlee.fmg.proc.data.minecraft; import kr.jongwonlee.fmg.game.MiniGame; -import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.Process; +import kr.jongwonlee.fmg.proc.*; import kr.jongwonlee.fmg.proc.data.control.SmallFrontBrace; import org.bukkit.entity.Entity; -import org.bukkit.entity.LivingEntity; import org.bukkit.util.Vector; import java.util.List;