diff --git a/pom.xml b/pom.xml
index 74583a3..80a3298 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,14 +59,6 @@
sonatype
https://oss.sonatype.org/content/groups/public/
-
- brokkonaut
- https://www.iani.de/nexus/repository/maven-releases/
-
-
- lunarakai
- https://lunarakai.de/nexus/repository/maven-releases/
-
@@ -76,12 +68,6 @@
1.21-R0.1-SNAPSHOT
provided
-
- de.iani.cubeside
- CubesideUtilsBukkit
- 1.16-SNAPSHOT
- provided
-
com.apptasticsoftware
rssreader
@@ -96,8 +82,8 @@
de.lunarakai
LunarUtils
- 0.0.1
- lunarutils
+ 0.0.2
+ provided
diff --git a/src/main/java/de/lunarakai/blockfox/commands/CreateCommand.java b/src/main/java/de/lunarakai/blockfox/commands/CreateCommand.java
index 83ae0c9..61cd077 100644
--- a/src/main/java/de/lunarakai/blockfox/commands/CreateCommand.java
+++ b/src/main/java/de/lunarakai/blockfox/commands/CreateCommand.java
@@ -9,7 +9,7 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
import de.iani.cubesideutils.commands.ArgsParser;
import de.lunarakai.blockfox.BlockFoxPlugin;
import de.lunarakai.blockfox.common.BlockFoxDisplay;
-import de.lunarakai.lunarutils.chat.MessageUtils;
+import de.lunarakai.lunarutils.chat.SimpleChatMessages;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -49,18 +49,18 @@ public class CreateCommand extends SubCommand {
public boolean onCommand(CommandSender sender, Command command, String s, String commandString, ArgsParser args) throws DisallowsCommandBlockException, RequiresPlayerException, NoPermissionException, IllegalSyntaxException, InternalCommandException {
Player player = (Player) sender;
if(args.remaining() < 1 || args.remaining() > 3) {
- MessageUtils.sendSimpleWarningMessage(player, commandString + getUsage());
+ SimpleChatMessages.sendSimpleWarningMessage(player, commandString + getUsage());
return true;
}
String name = args.getNext().toLowerCase().trim();
if(!VALID_NAME_PATTERN.matcher(name).matches()) {
- MessageUtils.sendSimpleWarningMessage(player, "display.name.invalid");
+ SimpleChatMessages.sendSimpleWarningMessage(player, "display.name.invalid");
return true;
}
if(plugin.getDisplayList().getBlockFoxDisplay(name) != null) {
- MessageUtils.sendSimpleWarningMessage(player, "display.name.exists");
+ SimpleChatMessages.sendSimpleWarningMessage(player, "display.name.exists");
return true;
}
@@ -73,7 +73,7 @@ public class CreateCommand extends SubCommand {
} else if(arg.equals("noblocks")) {
noblocks = true;
} else {
- MessageUtils.sendSimpleWarningMessage(player, commandString + getUsage());
+ SimpleChatMessages.sendSimpleWarningMessage(player, commandString + getUsage());
}
}
@@ -83,12 +83,12 @@ public class CreateCommand extends SubCommand {
@Nullable
RayTraceResult target = player.rayTraceBlocks(6);
if(target == null || target.getHitBlock() == null) {
- MessageUtils.sendSimpleWarningMessage(player, "display.create.lookAtCenter");
+ SimpleChatMessages.sendSimpleWarningMessage(player, "display.create.lookAtCenter");
return true;
}
BlockFace face = target.getHitBlockFace();
if(face != BlockFace.NORTH && face != BlockFace.WEST && face != BlockFace.EAST && face != BlockFace.SOUTH) {
- MessageUtils.sendSimpleWarningMessage(player, "display.create.lookAtSide");
+ SimpleChatMessages.sendSimpleWarningMessage(player, "display.create.lookAtSide");
return true;
}
location = target.getHitBlock().getLocation();
@@ -96,7 +96,7 @@ public class CreateCommand extends SubCommand {
BlockFoxDisplay newDisplay = new BlockFoxDisplay(plugin, name, location, orientation, fixed_mode);
if(plugin.getDisplayList().collidesWithBlockFoxDisplay(newDisplay)) {
- MessageUtils.sendSimpleWarningMessage(player, "display.create.collidesWithOther");
+ SimpleChatMessages.sendSimpleWarningMessage(player, "display.create.collidesWithOther");
return true;
}
newDisplay.generateDisplays();
@@ -104,7 +104,7 @@ public class CreateCommand extends SubCommand {
newDisplay.generateBackgroundBlocks();
}
plugin.getDisplayList().addBlockFoxDisplay(newDisplay);
- MessageUtils.sendSimpleSuccessMessage(player, "display.create.success");
+ SimpleChatMessages.sendSimpleSuccessMessage(player, "display.create.success");
return true;
}
diff --git a/src/main/java/de/lunarakai/blockfox/commands/DeleteCommand.java b/src/main/java/de/lunarakai/blockfox/commands/DeleteCommand.java
index 12cd820..f5771da 100644
--- a/src/main/java/de/lunarakai/blockfox/commands/DeleteCommand.java
+++ b/src/main/java/de/lunarakai/blockfox/commands/DeleteCommand.java
@@ -9,7 +9,7 @@ import de.iani.cubesideutils.bukkit.commands.exceptions.RequiresPlayerException;
import de.iani.cubesideutils.commands.ArgsParser;
import de.lunarakai.blockfox.BlockFoxPlugin;
import de.lunarakai.blockfox.common.BlockFoxDisplay;
-import de.lunarakai.lunarutils.chat.MessageUtils;
+import de.lunarakai.lunarutils.chat.SimpleChatMessages;
import java.util.Collection;
import java.util.List;
import org.bukkit.block.Block;
@@ -53,7 +53,7 @@ public class DeleteCommand extends SubCommand {
}
if(display != null) {
plugin.getDisplayList().removeBlockFoxDisplay(display);
- MessageUtils.sendSimpleWarningMessage(player, "display.delete.success");
+ SimpleChatMessages.sendSimpleWarningMessage(player, "display.delete.success");
}
return true;
}
diff --git a/src/main/java/de/lunarakai/blockfox/commands/TestRSSCommand.java b/src/main/java/de/lunarakai/blockfox/commands/TestRSSCommand.java
index 26dc5a1..4175ca6 100644
--- a/src/main/java/de/lunarakai/blockfox/commands/TestRSSCommand.java
+++ b/src/main/java/de/lunarakai/blockfox/commands/TestRSSCommand.java
@@ -13,8 +13,8 @@ import de.iani.cubesideutils.commands.ArgsParser;
import de.lunarakai.blockfox.BlockFoxPlugin;
import de.lunarakai.blockfox.utils.HTMLUtils;
import de.lunarakai.blockfox.utils.TimeUtils;
-import de.lunarakai.lunarutils.StringUtils;
-import de.lunarakai.lunarutils.chat.MessageUtils;
+import de.lunarakai.lunarutils.other.URIValidation;
+import de.lunarakai.lunarutils.chat.SimpleChatMessages;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
@@ -52,8 +52,8 @@ public class TestRSSCommand extends SubCommand {
}
String url = args.getNext().trim();
- if(!StringUtils.isValidURL(url)) {
- MessageUtils.sendSimpleWarningMessage(player, "please enter a valid URL");
+ if(!URIValidation.isValidURL(url)) {
+ SimpleChatMessages.sendSimpleWarningMessage(player, "please enter a valid URL");
return true;
}
@@ -72,7 +72,7 @@ public class TestRSSCommand extends SubCommand {
Document parsedTest = Jsoup.parse(optionaltest.get());
List list = HTMLUtils.formatHTMLList(parsedTest);
for(String string: list) {
- MessageUtils.sendSimpleSuccessMessage(player, string);
+ SimpleChatMessages.sendSimpleSuccessMessage(player, string);
}
} else {
Optional optionalDescription = items.getFirst().getDescription();
@@ -85,7 +85,7 @@ public class TestRSSCommand extends SubCommand {
Optional optionalDate = items.getFirst().getPubDate();
if(optionalDate.isPresent()) {
String time = TimeUtils.convertStringTime(plugin, optionalDate.get());
- MessageUtils.sendSimpleSpecialMessage(player, time, NamedTextColor.GRAY);
+ SimpleChatMessages.sendSimpleSpecialMessage(player, time, NamedTextColor.GRAY);
}
} catch (IOException e) {
throw new RuntimeException(e);
diff --git a/src/main/java/de/lunarakai/blockfox/common/BlockFoxManager.java b/src/main/java/de/lunarakai/blockfox/common/BlockFoxManager.java
index 41ccc50..6abe20f 100644
--- a/src/main/java/de/lunarakai/blockfox/common/BlockFoxManager.java
+++ b/src/main/java/de/lunarakai/blockfox/common/BlockFoxManager.java
@@ -2,7 +2,7 @@ package de.lunarakai.blockfox.common;
import com.google.common.base.Preconditions;
import de.lunarakai.blockfox.BlockFoxPlugin;
-import de.lunarakai.lunarutils.chat.MessageUtils;
+import de.lunarakai.lunarutils.chat.SimpleChatMessages;
import org.bukkit.entity.Player;
public class BlockFoxManager {
@@ -26,7 +26,7 @@ public class BlockFoxManager {
Preconditions.checkArgument(display != null, "player is not using any display");
plugin.getDisplayList().setBlockFoxDisplayForPlayer(player, null);
if(message) {
- MessageUtils.sendSimpleInfoMessage(player, "blockfox.display.usagecanceled");
+ SimpleChatMessages.sendSimpleInfoMessage(player, "blockfox.display.usagecanceled");
}
}
}