Update commands, plugin config, and add VS Code settings

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "automatic"
+}

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.softwarerat</groupId>
     <artifactId>SMPCore</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SMPCore</name>
@@ -15,17 +15,15 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <distributionManagement>
-        <repository>
-            <id>gitlab-maven</id>
-            <url>https://Gitlab.Softwarerat.com/api/v4/projects/14/packages/maven</url>
-        </repository>
 
-        <snapshotRepository>
+
-            <id>gitlab-maven</id>
+<distributionManagement>
-            <url>https://Gitlab.Softwarerat.com/api/v4/projects/14/packages/maven</url>
+    <repository>
-        </snapshotRepository>
+        <id>forgejo</id>
-    </distributionManagement>
+        <name>Forgejo Maven</name>
+        <url>http://heimserver.local:36107/api/packages/minecraft/maven</url>
+    </repository>
+</distributionManagement>
     <build>
         <plugins>
             <plugin>
@@ -63,10 +61,7 @@
     </build>
 
     <repositories>
-        <repository>
+    
-            <id>gitlab-maven</id>
-            <url>https://Gitlab.Softwarerat.com/api/v4/projects/14/packages/maven</url>
-        </repository>
         <repository>
             <id>papermc-repo</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
@@ -82,7 +77,7 @@
         <dependency>
             <groupId>com.softwarerat</groupId>
             <artifactId>HomesAPI</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.papermc.paper</groupId>
@@ -90,11 +85,16 @@
             <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
+     <dependency>
-            <groupId>com.softwarerat</groupId>
+	<groupId>com.softwarerat</groupId>
-            <artifactId>BansystemAPI</artifactId>
+	<artifactId>BansystemAPI</artifactId>
-            <version>1.6.1-BETA</version>
+	<version>1.6.9-BETA</version>
-        </dependency>
+</dependency>
-
+        	<dependency>
+		<groupId>org.projectlombok</groupId>
+		<artifactId>lombok</artifactId>
+		<version>1.18.42</version>
+		<scope>provided</scope>
+	</dependency>
     </dependencies>
 </project>

src/main/java/de/softwarerat/smpcore/Bansystem/Commands/BanPlayerCmd.java

@@ -1,7 +1,5 @@
 package de.softwarerat.smpcore.Bansystem.Commands;
 
-import de.softwarerat.smpcore.Bansystem.BanPlayer;
-import de.softwarerat.smpcore.Bansystem.MiliCalc;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -9,9 +7,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import de.softwarerat.smpcore.Bansystem.BanPlayer;
+import de.softwarerat.smpcore.Bansystem.MiliCalc;
+
 public class BanPlayerCmd implements CommandExecutor {
   BanPlayer banPlayer;
-  MiliCalc miliCalc;
+  MiliCalc miliCalc = new MiliCalc();
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         Player p = Bukkit.getPlayer(commandSender.getName());

src/main/java/de/softwarerat/smpcore/HomeSystem/HomeCmd.java

@@ -1,7 +1,8 @@
 package de.softwarerat.smpcore.HomeSystem;
 
-import com.softwarerat.SQL.Homes;
+
-import com.softwarerat.SQL.PlayerHome;
+import java.util.Objects;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
@@ -9,20 +10,32 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
+import com.softwarerat.homeAPI.HomesAPI;
+import com.softwarerat.homeAPI.SQL.Homes;
+import com.softwarerat.homeAPI.SQL.PlayerHome;
+
+import de.softwarerat.smpcore.SMPCore;
 
 public class HomeCmd implements CommandExecutor {
+   
+    HomesAPI homesAPI = new HomesAPI();
     Homes homes;
    
+    public HomeCmd(){
+        homesAPI.enableAPI(SMPCore.getPlugin(SMPCore.class).getDataFolder().getAbsolutePath(),"home.yml");
+        homes = homesAPI.getHomes();
+    }
+    
+
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
         PlayerHome playerHome;
-
+System.out.println(SMPCore.getPlugin(SMPCore.class).getDataFolder().getAbsolutePath());
     switch (strings[0]){
         
         case"create":
                 Location l = Objects.requireNonNull(Bukkit.getPlayer(commandSender.getName())).getLocation();
-                playerHome = new PlayerHome(strings[2], Objects.requireNonNull(Bukkit.getPlayer(commandSender.getName())).getUniqueId().toString(),l.getWorld().getName(),l.getX(),l.getY(),l.getZ());
+                playerHome = new PlayerHome(strings[1], Objects.requireNonNull(Bukkit.getPlayer(commandSender.getName())).getUniqueId().toString(),l.getWorld().getName(),l.getX(),l.getY(),l.getZ());
             homes.createNewHome(playerHome);
             commandSender.sendMessage("erfolgreich erstellt");
         break;
@@ -31,12 +44,13 @@ public class HomeCmd implements CommandExecutor {
         break;
         case "list":
             commandSender.sendMessage("du hast folgende Homes");
-        homes.getPlayerHomes(Objects.requireNonNull(Bukkit.getPlayer(commandSender.getName())).getUniqueId().toString()).forEach(e -> {commandSender.sendMessage(e.getName());});
+            homes.getPlayerHomes(Objects.requireNonNull(Bukkit.getPlayer(commandSender.getName())).getUniqueId().toString()).forEach(e -> {commandSender.sendMessage(e.getName());});
 
         break;
         case "tp":
         PlayerHome h = homes.getHomeByName(strings[1]);
         Location ld = new Location(Bukkit.getWorld(h.getWorld()),h.getX(),h.getY(),h.getZ());
+        System.out.println(h.getWorld()+h.getX()+h.getY()+h.getZ());
         Bukkit.getPlayer(commandSender.getName()).teleport(ld);
         commandSender.sendMessage("erfolgreich teleportiert");
         break;

src/main/java/de/softwarerat/smpcore/SMPCore.java

@@ -1,18 +1,26 @@
 package de.softwarerat.smpcore;
 
+import org.bukkit.plugin.java.JavaPlugin;
+
 import com.softwarerat.Bansystem;
 import com.softwarerat.MySQL.Ban;
-import org.bukkit.plugin.java.JavaPlugin;
+
+import de.softwarerat.smpcore.Bansystem.Commands.BanPlayerCmd;
+import de.softwarerat.smpcore.Bansystem.Commands.UnBanPlayerCmd;
+import de.softwarerat.smpcore.HomeSystem.HomeCmd;
 
 public final class SMPCore extends JavaPlugin {
-    Ban ban;
     @Override
     public void onEnable() {
         // Plugin startup logic
         Bansystem bansystem = new Bansystem();
-        bansystem.enableAPI("Benutzer","Passwort","Host","Datenbank");
+        bansystem.enableAPI("bansystem.yml",this.getDataFolder().getAbsolutePath());
+        Ban ban;
         ban = bansystem.getBan();
-
+        System.out.println(this.getDataFolder().getAbsolutePath());
+        getCommand("ban").setExecutor(new BanPlayerCmd());
+        getCommand("unban").setExecutor(new UnBanPlayerCmd()); 
+          getCommand("home").setExecutor(new HomeCmd()); 
        // Register Commands
 
 

src/main/resources/plugin.yml

@@ -1,4 +1,11 @@
 name: SMPCore
 version: '${project.version}'
 main: de.softwarerat.smpcore.SMPCore
-api-version: '1.20'
+api-version: '1.21'
+commands:
+  ban:
+    permission: smpcore.ban
+  unban:
+    permission: smpcore.unban
+  home:
+    permission: smpcore.home