pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.m724</groupId>
 	<artifactId>realweather</artifactId>
-	<version>0.9-alpha.3</version>
+	<version>0.9-alpha.3-SNAPSHOT</version>
 	
 	<properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -14,7 +14,7 @@
     
     <scm>
 		<developerConnection>scm:git:git@git.724.rocks:Minecon724/realweather.git</developerConnection>
-	  <tag>realweather-0.9-alpha.3</tag>
+	  <tag>HEAD</tag>
     </scm>
     
     <distributionManagement>

release.properties

@@ -1,5 +1,5 @@
 #release configuration
-#Tue Jun 18 13:42:52 CEST 2024
+#Tue Jun 18 13:28:07 CEST 2024
 completedPhase=check-poms
 exec.pomFileName=pom.xml
 exec.snapshotReleasePluginAllowed=false

src/main/java/eu/m724/realweather/RealWeatherPlugin.java

@@ -138,7 +138,8 @@ public class RealWeatherPlugin extends JavaPlugin {
 		
 		GlobalConstants.thunderMaster = thunderMaster;
 
-		getCommand("rwadmin").setExecutor(new AdminCommand(updater));
+		getCommand("rwadmin").setExecutor(new AdminCommand());
+		getCommand("rwadmin update").setExecutor(new UpdateCommand(updater));
 		getCommand("geo").setExecutor(new GeoCommand());
 		
 		if (GlobalConstants.timeConfig.enabled)

src/main/java/eu/m724/realweather/commands/AdminCommand.java

@@ -12,7 +12,6 @@ import eu.m724.realweather.mapper.MapperConfig;
 import eu.m724.realweather.thunder.ThunderConfig;
 import eu.m724.realweather.thunder.ThunderMaster;
 import eu.m724.realweather.time.TimeConfig;
-import eu.m724.realweather.updater.Updater;
 import eu.m724.realweather.weather.WeatherConfig;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -20,7 +19,6 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
 
 public class AdminCommand implements CommandExecutor {
-	private UpdateCommand updateCommand;
 	private Plugin plugin = GlobalConstants.getPlugin();
 	
 	private WeatherConfig weatherConfig = GlobalConstants.getWeatherConfig();
@@ -33,17 +31,9 @@ public class AdminCommand implements CommandExecutor {
 	private BaseComponent enabledComponent = TextComponent.fromLegacy("YES\n", ChatColor.GREEN);
 	private BaseComponent disabledComponent = TextComponent.fromLegacy("NO\n", ChatColor.RED);
 	
-	public AdminCommand(Updater updater) {
-		this.updateCommand = new UpdateCommand(updater);
-	}
-	
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		
+	
-		if (args.length > 0 && args[0].equals("update")) {
-			return updateCommand.onCommand(sender, command, label, args);
-		}
-		
 		ComponentBuilder componentBuilder =
 				new ComponentBuilder("\nRealWeather " + plugin.getDescription().getVersion() + "\n\n")
 				.color(ChatColor.YELLOW);

src/main/java/eu/m724/realweather/commands/UpdateCommand.java

@@ -9,19 +9,15 @@ import org.bukkit.command.CommandSender;
 import eu.m724.realweather.updater.Updater;
 import eu.m724.realweather.updater.metadata.VersionMetadata;
 
-/**
+public class UpdateCommand implements CommandExecutor {
- * not actually a command but deserves a separate file
- */
-public class UpdateCommand {
 	private Updater updater;
 	
 	public UpdateCommand(Updater updater) {
 		this.updater = updater;
 	}
 
+	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!sender.hasPermission("realweather.admin.update")) return false;
-		
 		sender.sendMessage("Please wait");
 		CompletableFuture<VersionMetadata> latestFuture = updater.getLatestVersion();
 		

src/main/resources/plugin.yml

@@ -16,6 +16,10 @@ commands:
     description: RealWeather admin command
     permission: realweather.admin
     permission-message: You do not have permission to use this command.
+  rwadmin update:
+    description: Update RealWeather
+    permission: realweather.admin.update
+    permission-message: You do not have permission to use this command.
     
   geo:
     description: Convert lat,lon to x,y,z and vice versa