Updates

Finished styling messages.
Cleaned up some code.
Ready for 1.0 Release

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'com.playdeca'
-version = '1.0-SNAPSHOT'
+version = '1.0'
 
 repositories {
  mavenCentral()

src/main/java/com/playdeca/portalzones/commands/createCommand.java

@@ -28,13 +28,13 @@ private void handleCreateCommandDB(Player player, String[] args){
  portalZoneDAO.createPortalZone(newPortal);
  ZoneManager.getInstance().setSelectedZone(newPortal);
  player.sendMessage("Portal Zone created and selected: " + zoneName);
- player.sendMessage(displayZoneName(zoneName));
- player.sendMessage(displayRegion1(newPortal.getRegion1()));
- player.sendMessage(displayRegion2(newPortal.getRegion2()));
- player.sendMessage(displaySoftCount(newPortal.getSoftCount()));
- player.sendMessage(displayHardCount(newPortal.getHardCount()));
- player.sendMessage(displayDestination1(newPortal.getXyz1().toString()));
- player.sendMessage(displayDestination2(newPortal.getXyz2().toString()));
+ player.sendMessage(displayZoneName(newPortal));
+ player.sendMessage(displayRegion1(newPortal));
+ player.sendMessage(displayRegion2(newPortal));
+ player.sendMessage(displaySoftCount(newPortal));
+ player.sendMessage(displayHardCount(newPortal));
+ player.sendMessage(displayDestination1(newPortal));
+ player.sendMessage(displayDestination2(newPortal));
 
  //re-Load zones from DB
  ZoneManager.getInstance().loadZones();

src/main/java/com/playdeca/portalzones/commands/helpCommand.java

@@ -1,12 +1,12 @@
 package com.playdeca.portalzones.commands;
 
+import com.playdeca.portalzones.services.HelperService;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public class helpCommand implements CommandExecutor {
+public class helpCommand extends HelperService {
  @Override
  public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
  if (sender instanceof Player player) {
@@ -17,22 +17,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
  }
 
  public void handleHelpCommand(Player player){
- player.sendMessage("Portal Zones Help:");
- player.sendMessage("/pz create <name> - Creates a new portal zone with the given name.");
- player.sendMessage("/pz select <name> - Selects the portal zone with the given name.");
- player.sendMessage("/pz update <all|region1Name|region2Name|softCountTime|hardCountTime|xyz1|xyz2> <value(if applicable)> - Updates the given property of the selected portal zone.");
- player.sendMessage("/pz list - Lists all portal zones.");
- player.sendMessage("/pz delete <name> - Deletes the portal zone with the given name.");
- player.sendMessage("/pz help - Displays this help message.");
- player.sendMessage("");
- player.sendMessage("When creating a new portal zone you must set all the data manually.");
- player.sendMessage("When updating a portal zone you can use the 'all' property to update all the data at once.");
- player.sendMessage("When updating a portal zone you can use the 'xyz1' and 'xyz2' properties to set the destination blocks.");
- player.sendMessage("When updating a portal zone you can use the 'region1Name' and 'region2Name' properties to set the region names.");
- player.sendMessage("When updating a portal zone you can use the 'softCountTime' and 'hardCountTime' properties to set the count times.");
- player.sendMessage("The SoftCountTime is the time in seconds that a player must be in the portal zone before the hardCountTime starts.");
- player.sendMessage("The HardCountTime is the time in seconds that a player must be in the portal zone before they are teleported.");
- player.sendMessage("The HardCountTime will be displayed and have a sound played when the player is in the portal zone.");
+ createHelpMessage(player);
  }
 
+
 }

src/main/java/com/playdeca/portalzones/commands/listCommand.java

@@ -33,13 +33,7 @@ private void handleListCommandDB(Player player) {
  }
  player.sendMessage("Portal Zones: ");
  for (PortalZone zone : zones) {
- player.sendMessage(displayZoneName(zone.getName()));
- player.sendMessage(displayRegion1(zone.getRegion1()));
- player.sendMessage(displayRegion2(zone.getRegion2()));
- player.sendMessage(displaySoftCount(zone.getSoftCount()));
- player.sendMessage(displayHardCount(zone.getHardCount()));
- player.sendMessage(displayDestination1(zone.getWorld1() + ", " + zone.getXyz1().getX() + ", " + zone.getXyz1().getY() + ", " + zone.getXyz1().getZ()));
- player.sendMessage(displayDestination2(zone.getWorld2() + ", " + zone.getXyz2().getX() + ", " + zone.getXyz2().getY() + ", " + zone.getXyz2().getZ()));
+ player.sendMessage(simpleRegionInfo(zone));
  }
 
  }catch (Exception e){

src/main/java/com/playdeca/portalzones/commands/selectCommand.java

@@ -37,13 +37,13 @@ private void handleSelectCommandDB(Player player, String[] args){
  }
  ZoneManager.getInstance().setSelectedZone(zone);
 
- player.sendMessage(displayZoneName(zone.getName()));
- player.sendMessage(displayRegion1(zone.getRegion1()));
- player.sendMessage(displayRegion2(zone.getRegion2()));
- player.sendMessage(displaySoftCount(zone.getSoftCount()));
- player.sendMessage(displayHardCount(zone.getHardCount()));
- player.sendMessage(displayDestination1(zone.getXyz1().toString()));
- player.sendMessage(displayDestination2(zone.getXyz2().toString()));
+ player.sendMessage(displayZoneName(zone));
+ player.sendMessage(displayRegion1(zone));
+ player.sendMessage(displayRegion2(zone));
+ player.sendMessage(displaySoftCount(zone));
+ player.sendMessage(displayHardCount(zone));
+ player.sendMessage(displayDestination1(zone));
+ player.sendMessage(displayDestination2(zone));
 
  }catch (Exception e){
  Bukkit.getLogger().warning("Error selecting portal zone: " + e.getMessage());

src/main/java/com/playdeca/portalzones/commands/updateCommand.java

@@ -7,7 +7,6 @@
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.world.World;
-import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
@@ -110,7 +109,7 @@ private void updateRegion1DB(String regionName, Player player){
  }
  ZoneManager.getInstance().getSelectedZone().setRegion1(regionName);
  portalZoneDAO.updatePortalZone(ZoneManager.getInstance().getSelectedZone());
- player.sendMessage("Region1 ->" + ZoneManager.getInstance().getSelectedZone().getRegion1());
+ player.sendMessage("Region1 ->" + ZoneManager.getInstance().getSelectedZone().getRegion1() + " updated.");
  }
 
  private void updateRegion2DB(String regionName, Player player){
@@ -120,19 +119,19 @@ private void updateRegion2DB(String regionName, Player player){
  }
  ZoneManager.getInstance().getSelectedZone().setRegion2(regionName);
  portalZoneDAO.updatePortalZone(ZoneManager.getInstance().getSelectedZone());
- player.sendMessage("Region2 ->" + ZoneManager.getInstance().getSelectedZone().getRegion2());
+ player.sendMessage("Region2 ->" + ZoneManager.getInstance().getSelectedZone().getRegion2() + " updated.");
  }
 
  private void updateSoftCountDB(int softCount, Player player){
  ZoneManager.getInstance().getSelectedZone().setSoftCount(softCount);
  portalZoneDAO.updatePortalZone(ZoneManager.getInstance().getSelectedZone());
- player.sendMessage("SoftCountTime ->" + ZoneManager.getInstance().getSelectedZone().getSoftCount());
+ player.sendMessage("SoftCountTime ->" + ZoneManager.getInstance().getSelectedZone().getSoftCount() + " updated.");
  }
 
  private void updateHardCountDB(int hardCount, Player player){
  ZoneManager.getInstance().getSelectedZone().setHardCount(hardCount);
  portalZoneDAO.updatePortalZone(ZoneManager.getInstance().getSelectedZone());
- player.sendMessage("HardCountTime ->" + ZoneManager.getInstance().getSelectedZone().getHardCount());
+ player.sendMessage("HardCountTime ->" + ZoneManager.getInstance().getSelectedZone().getHardCount() + " updated.");
  }
 
  private void updateXYZ1DB(Player player){
@@ -145,7 +144,7 @@ private void updateXYZ1DB(Player player){
  Location newLocation = new Location(BukkitAdapter.adapt(selection.getWorld()), newSelection.getX(), newSelection.getY()+1, newSelection.getZ());
  ZoneManager.getInstance().getSelectedZone().setXyz1(newLocation);
  portalZoneDAO.updatePortalZone(ZoneManager.getInstance().getSelectedZone());
- player.sendMessage("Destination1 ->" + ZoneManager.getInstance().getSelectedZone().getRegion1());
+ player.sendMessage("Destination1 ->" + ZoneManager.getInstance().getSelectedZone().getRegion1() + " updated.");
  }else {
  player.sendMessage("Please select the destination (Left Click) block using the WorldEdit wand tool before using this command.");
  }