diff --git a/src/io/github/dre2n/dungeonsxl/command/BreakCommand.java b/src/io/github/dre2n/dungeonsxl/command/BreakCommand.java index bd69547c..bc1d0b3d 100644 --- a/src/io/github/dre2n/dungeonsxl/command/BreakCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/BreakCommand.java @@ -1,7 +1,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/ChatCommand.java b/src/io/github/dre2n/dungeonsxl/command/ChatCommand.java index 3bfa7095..c28f9f31 100644 --- a/src/io/github/dre2n/dungeonsxl/command/ChatCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/ChatCommand.java @@ -2,7 +2,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java b/src/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java index 3049ea8b..fe100e25 100644 --- a/src/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java @@ -1,7 +1,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/CreateCommand.java b/src/io/github/dre2n/dungeonsxl/command/CreateCommand.java index efded8b1..350273de 100644 --- a/src/io/github/dre2n/dungeonsxl/command/CreateCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/CreateCommand.java @@ -3,7 +3,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/DCommand.java b/src/io/github/dre2n/dungeonsxl/command/DCommand.java index c2108729..28ed7410 100644 --- a/src/io/github/dre2n/dungeonsxl/command/DCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/DCommand.java @@ -2,7 +2,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.file.DMessages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java b/src/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java index 19c08771..d3f55fe3 100644 --- a/src/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java @@ -2,7 +2,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.global.DPortal; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.util.Set; diff --git a/src/io/github/dre2n/dungeonsxl/command/EditCommand.java b/src/io/github/dre2n/dungeonsxl/command/EditCommand.java index f6cf255c..5566aa4a 100644 --- a/src/io/github/dre2n/dungeonsxl/command/EditCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/EditCommand.java @@ -4,7 +4,7 @@ import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/EscapeCommand.java b/src/io/github/dre2n/dungeonsxl/command/EscapeCommand.java index 2b5f05e0..3ce788a8 100644 --- a/src/io/github/dre2n/dungeonsxl/command/EscapeCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/EscapeCommand.java @@ -4,7 +4,7 @@ import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/HelpCommand.java b/src/io/github/dre2n/dungeonsxl/command/HelpCommand.java index 89b670bd..314d054a 100644 --- a/src/io/github/dre2n/dungeonsxl/command/HelpCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/HelpCommand.java @@ -5,7 +5,7 @@ import java.util.List; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.util.IntegerUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/InviteCommand.java b/src/io/github/dre2n/dungeonsxl/command/InviteCommand.java index 69408829..b7885a77 100644 --- a/src/io/github/dre2n/dungeonsxl/command/InviteCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/InviteCommand.java @@ -2,8 +2,8 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; import io.github.dre2n.dungeonsxl.util.UUIDUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/LeaveCommand.java b/src/io/github/dre2n/dungeonsxl/command/LeaveCommand.java index 884da38e..05bbc4bb 100644 --- a/src/io/github/dre2n/dungeonsxl/command/LeaveCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/LeaveCommand.java @@ -4,7 +4,7 @@ import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/ListCommand.java b/src/io/github/dre2n/dungeonsxl/command/ListCommand.java index e4c26907..811b4af2 100644 --- a/src/io/github/dre2n/dungeonsxl/command/ListCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/ListCommand.java @@ -7,7 +7,7 @@ import io.github.dre2n.dungeonsxl.dungeon.WorldConfig; import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.util.IntegerUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; import java.util.ArrayList; diff --git a/src/io/github/dre2n/dungeonsxl/command/LivesCommand.java b/src/io/github/dre2n/dungeonsxl/command/LivesCommand.java index 4b246124..12374914 100644 --- a/src/io/github/dre2n/dungeonsxl/command/LivesCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/LivesCommand.java @@ -2,7 +2,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/MainCommand.java b/src/io/github/dre2n/dungeonsxl/command/MainCommand.java index 47176eff..0ad87eeb 100644 --- a/src/io/github/dre2n/dungeonsxl/command/MainCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/MainCommand.java @@ -4,8 +4,8 @@ import java.io.File; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; import io.github.dre2n.dungeonsxl.util.VersionUtil.Internals; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/MsgCommand.java b/src/io/github/dre2n/dungeonsxl/command/MsgCommand.java index b4037e97..b4a330f0 100644 --- a/src/io/github/dre2n/dungeonsxl/command/MsgCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/MsgCommand.java @@ -4,7 +4,7 @@ import io.github.dre2n.dungeonsxl.dungeon.WorldConfig; import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.util.IntegerUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; diff --git a/src/io/github/dre2n/dungeonsxl/command/PlayCommand.java b/src/io/github/dre2n/dungeonsxl/command/PlayCommand.java index eb432080..13334adf 100644 --- a/src/io/github/dre2n/dungeonsxl/command/PlayCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/PlayCommand.java @@ -7,7 +7,7 @@ import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; diff --git a/src/io/github/dre2n/dungeonsxl/command/PortalCommand.java b/src/io/github/dre2n/dungeonsxl/command/PortalCommand.java index 6a7a94aa..1186ab2d 100644 --- a/src/io/github/dre2n/dungeonsxl/command/PortalCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/PortalCommand.java @@ -3,7 +3,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.global.DPortal; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.Material; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/src/io/github/dre2n/dungeonsxl/command/ReloadCommand.java index 3890b33d..2970f3b2 100644 --- a/src/io/github/dre2n/dungeonsxl/command/ReloadCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/ReloadCommand.java @@ -2,8 +2,8 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; import io.github.dre2n.dungeonsxl.util.VersionUtil.Internals; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; diff --git a/src/io/github/dre2n/dungeonsxl/command/SaveCommand.java b/src/io/github/dre2n/dungeonsxl/command/SaveCommand.java index 96e92ab0..91909fed 100644 --- a/src/io/github/dre2n/dungeonsxl/command/SaveCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/SaveCommand.java @@ -2,7 +2,7 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/TestCommand.java b/src/io/github/dre2n/dungeonsxl/command/TestCommand.java index d116a5ff..01c676f3 100644 --- a/src/io/github/dre2n/dungeonsxl/command/TestCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/TestCommand.java @@ -6,7 +6,7 @@ import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/io/github/dre2n/dungeonsxl/command/UninviteCommand.java b/src/io/github/dre2n/dungeonsxl/command/UninviteCommand.java index 10a5b14a..7c8622ba 100644 --- a/src/io/github/dre2n/dungeonsxl/command/UninviteCommand.java +++ b/src/io/github/dre2n/dungeonsxl/command/UninviteCommand.java @@ -2,8 +2,8 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.dungeonsxl.dungeon.EditWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; -import io.github.dre2n.dungeonsxl.util.MessageUtil; import io.github.dre2n.dungeonsxl.util.UUIDUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.command.CommandSender; diff --git a/src/io/github/dre2n/dungeonsxl/dungeon/EditWorld.java b/src/io/github/dre2n/dungeonsxl/dungeon/EditWorld.java index 0daba34b..9e866948 100644 --- a/src/io/github/dre2n/dungeonsxl/dungeon/EditWorld.java +++ b/src/io/github/dre2n/dungeonsxl/dungeon/EditWorld.java @@ -3,7 +3,7 @@ package io.github.dre2n.dungeonsxl.dungeon; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.player.DPlayer; import io.github.dre2n.dungeonsxl.util.FileUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; import java.io.FileInputStream; diff --git a/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java b/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java index 5ae64cd4..1e41cd2d 100644 --- a/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java +++ b/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java @@ -4,7 +4,7 @@ import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import net.milkbowl.vault.item.ItemInfo; import net.milkbowl.vault.item.Items; diff --git a/src/io/github/dre2n/dungeonsxl/dungeon/game/GameWorld.java b/src/io/github/dre2n/dungeonsxl/dungeon/game/GameWorld.java index fcf2b31d..fd10aa02 100644 --- a/src/io/github/dre2n/dungeonsxl/dungeon/game/GameWorld.java +++ b/src/io/github/dre2n/dungeonsxl/dungeon/game/GameWorld.java @@ -10,7 +10,7 @@ import io.github.dre2n.dungeonsxl.player.DPlayer; import io.github.dre2n.dungeonsxl.sign.DSign; import io.github.dre2n.dungeonsxl.trigger.RedstoneTrigger; import io.github.dre2n.dungeonsxl.util.FileUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; import java.io.FileInputStream; diff --git a/src/io/github/dre2n/dungeonsxl/global/DPortal.java b/src/io/github/dre2n/dungeonsxl/global/DPortal.java index 456b0c1e..a0b60829 100644 --- a/src/io/github/dre2n/dungeonsxl/global/DPortal.java +++ b/src/io/github/dre2n/dungeonsxl/global/DPortal.java @@ -5,7 +5,7 @@ import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/io/github/dre2n/dungeonsxl/global/GroupSign.java b/src/io/github/dre2n/dungeonsxl/global/GroupSign.java index c230ef6c..69c28b44 100644 --- a/src/io/github/dre2n/dungeonsxl/global/GroupSign.java +++ b/src/io/github/dre2n/dungeonsxl/global/GroupSign.java @@ -6,7 +6,7 @@ import io.github.dre2n.dungeonsxl.dungeon.WorldConfig; import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/io/github/dre2n/dungeonsxl/global/LeaveSign.java b/src/io/github/dre2n/dungeonsxl/global/LeaveSign.java index ba99cc27..e7aa4db0 100644 --- a/src/io/github/dre2n/dungeonsxl/global/LeaveSign.java +++ b/src/io/github/dre2n/dungeonsxl/global/LeaveSign.java @@ -4,7 +4,7 @@ import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/io/github/dre2n/dungeonsxl/listener/BlockListener.java b/src/io/github/dre2n/dungeonsxl/listener/BlockListener.java index e6a6104b..86325fae 100644 --- a/src/io/github/dre2n/dungeonsxl/listener/BlockListener.java +++ b/src/io/github/dre2n/dungeonsxl/listener/BlockListener.java @@ -11,7 +11,7 @@ import io.github.dre2n.dungeonsxl.global.LeaveSign; import io.github.dre2n.dungeonsxl.sign.DSign; import io.github.dre2n.dungeonsxl.trigger.RedstoneTrigger; import io.github.dre2n.dungeonsxl.util.IntegerUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/io/github/dre2n/dungeonsxl/listener/CommandListener.java b/src/io/github/dre2n/dungeonsxl/listener/CommandListener.java index 14eec0fb..4f15336f 100644 --- a/src/io/github/dre2n/dungeonsxl/listener/CommandListener.java +++ b/src/io/github/dre2n/dungeonsxl/listener/CommandListener.java @@ -1,7 +1,7 @@ package io.github.dre2n.dungeonsxl.listener; import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import io.github.dre2n.dungeonsxl.command.DCommand; import io.github.dre2n.dungeonsxl.file.DMessages; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; diff --git a/src/io/github/dre2n/dungeonsxl/listener/PlayerListener.java b/src/io/github/dre2n/dungeonsxl/listener/PlayerListener.java index 5544aa46..e5d9b9aa 100644 --- a/src/io/github/dre2n/dungeonsxl/listener/PlayerListener.java +++ b/src/io/github/dre2n/dungeonsxl/listener/PlayerListener.java @@ -15,8 +15,8 @@ import io.github.dre2n.dungeonsxl.player.DGroup; import io.github.dre2n.dungeonsxl.player.DPlayer; import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; import io.github.dre2n.dungeonsxl.trigger.UseItemTrigger; -import io.github.dre2n.dungeonsxl.util.MessageUtil; import io.github.dre2n.dungeonsxl.util.MiscUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/io/github/dre2n/dungeonsxl/player/DGroup.java b/src/io/github/dre2n/dungeonsxl/player/DGroup.java index a4675b6c..fd968a27 100644 --- a/src/io/github/dre2n/dungeonsxl/player/DGroup.java +++ b/src/io/github/dre2n/dungeonsxl/player/DGroup.java @@ -6,7 +6,7 @@ import io.github.dre2n.dungeonsxl.dungeon.WorldConfig; import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.global.GroupSign; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; import java.util.ArrayList; diff --git a/src/io/github/dre2n/dungeonsxl/player/DPlayer.java b/src/io/github/dre2n/dungeonsxl/player/DPlayer.java index f8baf156..9efdec9d 100644 --- a/src/io/github/dre2n/dungeonsxl/player/DPlayer.java +++ b/src/io/github/dre2n/dungeonsxl/player/DPlayer.java @@ -10,8 +10,8 @@ import io.github.dre2n.dungeonsxl.file.DMessages; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.trigger.DistanceTrigger; import io.github.dre2n.dungeonsxl.util.IntegerUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; import io.github.dre2n.dungeonsxl.util.MiscUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.io.File; import java.io.IOException; diff --git a/src/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java b/src/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java index a2309433..f03af57f 100644 --- a/src/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java +++ b/src/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java @@ -3,7 +3,7 @@ package io.github.dre2n.dungeonsxl.sign; import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DPlayer; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/io/github/dre2n/dungeonsxl/sign/MessageSign.java b/src/io/github/dre2n/dungeonsxl/sign/MessageSign.java index 8ccea7cc..3f6ee30f 100644 --- a/src/io/github/dre2n/dungeonsxl/sign/MessageSign.java +++ b/src/io/github/dre2n/dungeonsxl/sign/MessageSign.java @@ -2,7 +2,7 @@ package io.github.dre2n.dungeonsxl.sign; import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.util.IntegerUtil; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java b/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java index ef8758c0..264d2d0b 100644 --- a/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java +++ b/src/io/github/dre2n/dungeonsxl/sign/ReadySign.java @@ -5,7 +5,7 @@ import io.github.dre2n.dungeonsxl.dungeon.game.GameWorld; import io.github.dre2n.dungeonsxl.file.DMessages.Messages; import io.github.dre2n.dungeonsxl.player.DPlayer; import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.util.MessageUtil; +import io.github.dre2n.dungeonsxl.util.messageutil.MessageUtil; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/io/github/dre2n/dungeonsxl/util/MessageUtil.java b/src/io/github/dre2n/dungeonsxl/util/messageutil/MessageUtil.java similarity index 87% rename from src/io/github/dre2n/dungeonsxl/util/MessageUtil.java rename to src/io/github/dre2n/dungeonsxl/util/messageutil/MessageUtil.java index 8de153d3..4c35d0f3 100644 --- a/src/io/github/dre2n/dungeonsxl/util/MessageUtil.java +++ b/src/io/github/dre2n/dungeonsxl/util/messageutil/MessageUtil.java @@ -1,4 +1,7 @@ -package io.github.dre2n.dungeonsxl.util; +package io.github.dre2n.dungeonsxl.util.messageutil; + +import io.github.dre2n.dungeonsxl.DungeonsXL; +import io.github.dre2n.dungeonsxl.util.VersionUtil; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -8,6 +11,8 @@ import org.bukkit.plugin.Plugin; public class MessageUtil { + static VersionUtil versionUtil = DungeonsXL.getPlugin().getVersion(); + public enum DefaultFontInfo { A('A', 5), @@ -205,24 +210,34 @@ public class MessageUtil { sendCenteredMessage(sender, "&4&l[ &6" + plugin.getDescription().getName() + " &4&l]"); } - public static void sendScreenMessage(Player player, String title, String subtitle, long fadeIn, long show, long fadeOut) { - subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); - title = ChatColor.translateAlternateColorCodes('&', title); - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " time " + fadeIn + " " + show + " " + fadeOut); - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " subtitle " + subtitle); - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " title " + title); + public static void sendScreenMessage(Player player, String title, String subtitle, int fadeIn, int show, int fadeOut) { + switch (versionUtil.getInternals()) { + case v1_8_R1: + v1_8_R1.sendScreenMessage(player, title, subtitle, fadeIn, show, fadeOut); + break; + case v1_8_R2: + v1_8_R2.sendScreenMessage(player, title, subtitle, fadeIn, show, fadeOut); + break; + case v1_8_R3: + v1_8_R3.sendScreenMessage(player, title, subtitle, fadeIn, show, fadeOut); + break; + case v1_9_R1: + v1_9_R1.sendScreenMessage(player, title, subtitle, fadeIn, show, fadeOut); + break; + case UNKNOWN: + UNKNOWN.sendScreenMessage(player, title, subtitle, fadeIn, show, fadeOut); + break; + default: + return; + } } public static void sendScreenMessage(Player player, String title, String subtitle) { - subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); - title = ChatColor.translateAlternateColorCodes('&', title); - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " subtitle \"" + subtitle + "\""); - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " title \"" + title + "\""); + sendScreenMessage(player, title, subtitle, 20, 60, 20); } public static void sendScreenMessage(Player player, String title) { - title = ChatColor.translateAlternateColorCodes('&', title); - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " title \"" + title + "\""); + sendScreenMessage(player, title, "", 20, 60, 20); } public static final String[] BIG_A = { diff --git a/src/io/github/dre2n/dungeonsxl/util/messageutil/UNKNOWN.java b/src/io/github/dre2n/dungeonsxl/util/messageutil/UNKNOWN.java new file mode 100644 index 00000000..4ee7a1c1 --- /dev/null +++ b/src/io/github/dre2n/dungeonsxl/util/messageutil/UNKNOWN.java @@ -0,0 +1,29 @@ +package io.github.dre2n.dungeonsxl.util.messageutil; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; + +class UNKNOWN { + + static void sendScreenMessage(Player player, String title, String subtitle, long fadeIn, long show, long fadeOut) { + subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); + title = ChatColor.translateAlternateColorCodes('&', title); + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " time " + fadeIn + " " + show + " " + fadeOut); + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " subtitle " + subtitle); + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " title " + title); + } + + static void sendScreenMessage(Player player, String title, String subtitle) { + subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); + title = ChatColor.translateAlternateColorCodes('&', title); + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " subtitle " + subtitle); + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " title " + title); + } + + public static void sendScreenMessage(Player player, String title) { + title = ChatColor.translateAlternateColorCodes('&', title); + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "title " + player.getName() + " title \"" + title + "\""); + } + +} diff --git a/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R1.java b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R1.java new file mode 100644 index 00000000..eb8ab911 --- /dev/null +++ b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R1.java @@ -0,0 +1,36 @@ +package io.github.dre2n.dungeonsxl.util.messageutil; + +import net.minecraft.server.v1_8_R1.IChatBaseComponent; +import net.minecraft.server.v1_8_R1.PacketPlayOutTitle; +import net.minecraft.server.v1_8_R1.PlayerConnection; +import net.minecraft.server.v1_8_R1.ChatSerializer; +import net.minecraft.server.v1_8_R1.EnumTitleAction; + +import org.bukkit.ChatColor; +import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +class v1_8_R1 { + + static void sendScreenMessage(Player player, String title, String subtitle, int fadeIn, int show, int fadeOut) { + subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); + title = ChatColor.translateAlternateColorCodes('&', title); + + IChatBaseComponent subtitleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\"}"); + IChatBaseComponent titleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', title) + "\"}"); + + PacketPlayOutTitle clearPacket = new PacketPlayOutTitle(EnumTitleAction.CLEAR, titleComponent); + PacketPlayOutTitle resetPacket = new PacketPlayOutTitle(EnumTitleAction.RESET, titleComponent); + PacketPlayOutTitle subtitlePacket = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, subtitleComponent); + PacketPlayOutTitle titlePacket = new PacketPlayOutTitle(EnumTitleAction.TITLE, titleComponent); + PacketPlayOutTitle timesPacket = new PacketPlayOutTitle(fadeIn, show, fadeOut); + + PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection; + connection.sendPacket(clearPacket); + connection.sendPacket(resetPacket); + connection.sendPacket(subtitlePacket); + connection.sendPacket(titlePacket); + connection.sendPacket(timesPacket); + } + +} diff --git a/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R2.java b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R2.java new file mode 100644 index 00000000..9691a933 --- /dev/null +++ b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R2.java @@ -0,0 +1,36 @@ +package io.github.dre2n.dungeonsxl.util.messageutil; + +import net.minecraft.server.v1_8_R2.IChatBaseComponent; +import net.minecraft.server.v1_8_R2.PacketPlayOutTitle; +import net.minecraft.server.v1_8_R2.PlayerConnection; +import net.minecraft.server.v1_8_R2.IChatBaseComponent.ChatSerializer; +import net.minecraft.server.v1_8_R2.PacketPlayOutTitle.EnumTitleAction; + +import org.bukkit.ChatColor; +import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; +import org.bukkit.entity.Player; + +class v1_8_R2 { + + static void sendScreenMessage(Player player, String title, String subtitle, int fadeIn, int show, int fadeOut) { + subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); + title = ChatColor.translateAlternateColorCodes('&', title); + + IChatBaseComponent subtitleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\"}"); + IChatBaseComponent titleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', title) + "\"}"); + + PacketPlayOutTitle clearPacket = new PacketPlayOutTitle(EnumTitleAction.CLEAR, titleComponent); + PacketPlayOutTitle resetPacket = new PacketPlayOutTitle(EnumTitleAction.RESET, titleComponent); + PacketPlayOutTitle subtitlePacket = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, subtitleComponent); + PacketPlayOutTitle titlePacket = new PacketPlayOutTitle(EnumTitleAction.TITLE, titleComponent); + PacketPlayOutTitle timesPacket = new PacketPlayOutTitle(fadeIn, show, fadeOut); + + PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection; + connection.sendPacket(clearPacket); + connection.sendPacket(resetPacket); + connection.sendPacket(subtitlePacket); + connection.sendPacket(titlePacket); + connection.sendPacket(timesPacket); + } + +} diff --git a/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R3.java b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R3.java new file mode 100644 index 00000000..85a88de4 --- /dev/null +++ b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_8_R3.java @@ -0,0 +1,36 @@ +package io.github.dre2n.dungeonsxl.util.messageutil; + +import net.minecraft.server.v1_8_R3.IChatBaseComponent; +import net.minecraft.server.v1_8_R3.PacketPlayOutTitle; +import net.minecraft.server.v1_8_R3.PlayerConnection; +import net.minecraft.server.v1_8_R3.IChatBaseComponent.ChatSerializer; +import net.minecraft.server.v1_8_R3.PacketPlayOutTitle.EnumTitleAction; + +import org.bukkit.ChatColor; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +import org.bukkit.entity.Player; + +class v1_8_R3 { + + static void sendScreenMessage(Player player, String title, String subtitle, int fadeIn, int show, int fadeOut) { + subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); + title = ChatColor.translateAlternateColorCodes('&', title); + + IChatBaseComponent subtitleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\"}"); + IChatBaseComponent titleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', title) + "\"}"); + + PacketPlayOutTitle clearPacket = new PacketPlayOutTitle(EnumTitleAction.CLEAR, titleComponent); + PacketPlayOutTitle resetPacket = new PacketPlayOutTitle(EnumTitleAction.RESET, titleComponent); + PacketPlayOutTitle subtitlePacket = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, subtitleComponent); + PacketPlayOutTitle titlePacket = new PacketPlayOutTitle(EnumTitleAction.TITLE, titleComponent); + PacketPlayOutTitle timesPacket = new PacketPlayOutTitle(fadeIn, show, fadeOut); + + PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection; + connection.sendPacket(clearPacket); + connection.sendPacket(resetPacket); + connection.sendPacket(subtitlePacket); + connection.sendPacket(titlePacket); + connection.sendPacket(timesPacket); + } + +} diff --git a/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_9_R1.java b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_9_R1.java new file mode 100644 index 00000000..4be15f0c --- /dev/null +++ b/src/io/github/dre2n/dungeonsxl/util/messageutil/v1_9_R1.java @@ -0,0 +1,36 @@ +package io.github.dre2n.dungeonsxl.util.messageutil; + +import net.minecraft.server.v1_9_R1.IChatBaseComponent; +import net.minecraft.server.v1_9_R1.PacketPlayOutTitle; +import net.minecraft.server.v1_9_R1.PlayerConnection; +import net.minecraft.server.v1_9_R1.IChatBaseComponent.ChatSerializer; +import net.minecraft.server.v1_9_R1.PacketPlayOutTitle.EnumTitleAction; + +import org.bukkit.ChatColor; +import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +class v1_9_R1 { + + static void sendScreenMessage(Player player, String title, String subtitle, int fadeIn, int show, int fadeOut) { + subtitle = ChatColor.translateAlternateColorCodes('&', subtitle); + title = ChatColor.translateAlternateColorCodes('&', title); + + IChatBaseComponent subtitleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\"}"); + IChatBaseComponent titleComponent = ChatSerializer.a("{\"text\": \"" + ChatColor.translateAlternateColorCodes('&', title) + "\"}"); + + PacketPlayOutTitle clearPacket = new PacketPlayOutTitle(EnumTitleAction.CLEAR, titleComponent); + PacketPlayOutTitle resetPacket = new PacketPlayOutTitle(EnumTitleAction.RESET, titleComponent); + PacketPlayOutTitle subtitlePacket = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, subtitleComponent); + PacketPlayOutTitle titlePacket = new PacketPlayOutTitle(EnumTitleAction.TITLE, titleComponent); + PacketPlayOutTitle timesPacket = new PacketPlayOutTitle(fadeIn, show, fadeOut); + + PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection; + connection.sendPacket(clearPacket); + connection.sendPacket(resetPacket); + connection.sendPacket(subtitlePacket); + connection.sendPacket(titlePacket); + connection.sendPacket(timesPacket); + } + +} diff --git a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R3.java b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R3.java index 536e2ab3..da2f1e44 100644 --- a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R3.java +++ b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R3.java @@ -14,9 +14,9 @@ import org.bukkit.craftbukkit.v1_7_R3.CraftServer; import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; import org.bukkit.entity.Player; -public class v1_7_R3 { +class v1_7_R3 { - public static Player getOfflinePlayer(String player, UUID uuid) { + static Player getOfflinePlayer(String player, UUID uuid) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); @@ -43,7 +43,7 @@ public class v1_7_R3 { return pplayer; } - public static Player getOfflinePlayer(String player, UUID uuid, Location location) { + static Player getOfflinePlayer(String player, UUID uuid, Location location) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); diff --git a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R4.java b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R4.java index 15e7220c..917db00e 100644 --- a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R4.java +++ b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_7_R4.java @@ -14,9 +14,9 @@ import org.bukkit.craftbukkit.v1_7_R4.CraftServer; import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; import org.bukkit.entity.Player; -public class v1_7_R4 { +class v1_7_R4 { - public static Player getOfflinePlayer(String player, UUID uuid) { + static Player getOfflinePlayer(String player, UUID uuid) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); @@ -43,7 +43,7 @@ public class v1_7_R4 { return pplayer; } - public static Player getOfflinePlayer(String player, UUID uuid, Location location) { + static Player getOfflinePlayer(String player, UUID uuid, Location location) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); diff --git a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R1.java b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R1.java index e03d0505..d13417ac 100644 --- a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R1.java +++ b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R1.java @@ -15,9 +15,9 @@ import org.bukkit.entity.Player; import com.mojang.authlib.GameProfile; -public class v1_8_R1 { +class v1_8_R1 { - public static Player getOfflinePlayer(String player, UUID uuid) { + static Player getOfflinePlayer(String player, UUID uuid) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); @@ -44,7 +44,7 @@ public class v1_8_R1 { return pplayer; } - public static Player getOfflinePlayer(String player, UUID uuid, Location location) { + static Player getOfflinePlayer(String player, UUID uuid, Location location) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); diff --git a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R2.java b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R2.java index f037605a..26cb5ace 100644 --- a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R2.java +++ b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R2.java @@ -15,9 +15,9 @@ import org.bukkit.entity.Player; import com.mojang.authlib.GameProfile; -public class v1_8_R2 { +class v1_8_R2 { - public static Player getOfflinePlayer(String player, UUID uuid) { + static Player getOfflinePlayer(String player, UUID uuid) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); @@ -44,7 +44,7 @@ public class v1_8_R2 { return pplayer; } - public static Player getOfflinePlayer(String player, UUID uuid, Location location) { + static Player getOfflinePlayer(String player, UUID uuid, Location location) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); diff --git a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R3.java b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R3.java index e076864f..d2ecf380 100644 --- a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R3.java +++ b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_8_R3.java @@ -15,9 +15,9 @@ import org.bukkit.entity.Player; import com.mojang.authlib.GameProfile; -public class v1_8_R3 { +class v1_8_R3 { - public static Player getOfflinePlayer(String player, UUID uuid) { + static Player getOfflinePlayer(String player, UUID uuid) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); @@ -44,7 +44,7 @@ public class v1_8_R3 { return pplayer; } - public static Player getOfflinePlayer(String player, UUID uuid, Location location) { + static Player getOfflinePlayer(String player, UUID uuid, Location location) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); diff --git a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_9_R1.java b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_9_R1.java index 68b34e5b..44ed1ee3 100644 --- a/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_9_R1.java +++ b/src/io/github/dre2n/dungeonsxl/util/offlineplayerutil/v1_9_R1.java @@ -15,9 +15,9 @@ import org.bukkit.entity.Player; import com.mojang.authlib.GameProfile; -public class v1_9_R1 { +class v1_9_R1 { - public static Player getOfflinePlayer(String player, UUID uuid) { + static Player getOfflinePlayer(String player, UUID uuid) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); @@ -44,7 +44,7 @@ public class v1_9_R1 { return pplayer; } - public static Player getOfflinePlayer(String player, UUID uuid, Location location) { + static Player getOfflinePlayer(String player, UUID uuid, Location location) { Player pplayer = null; try { File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");