.gitea/workflows/release.yml

@@ -1,60 +0,0 @@
-name: Build and Release Minecraft Plugin
-
-on:
-  push:
-    branches:
-      - Resting
-
-jobs:
-  build-and-release:
-
-    steps:
-      # Repository auschecken
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      # Java 17 installieren
-      - name: Set up Java 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      # Maven installieren
-      - name: Install Maven
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y maven
-
-      # Plugin-Version aus plugin.yml auslesen
-      - name: Extract Plugin Version
-        id: extract_version
-        run: |
-          VERSION=$(grep '^version:' src/main/resources/plugin.yml | awk '{print $2}')
-          echo "PLUGIN_VERSION=$VERSION" >> $GITHUB_ENV
-
-      # Projekt mit Maven bauen
-      - name: Build with Maven
-        run: mvn clean package
-
-      # JAR-Datei umbenennen
-      - name: Rename JAR File
-        run: |
-          mv target/*.jar target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Artefakt hochladen
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Release erstellen
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          tag_name: ${{ env.PLUGIN_VERSION }}
-          release_name: Release ${{ env.PLUGIN_VERSION }}
-          draft: false
-          prerelease: false

.gitea/workflows/release.yml.disabled

@@ -0,0 +1,65 @@
+name: Build and Release Minecraft Plugin
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt' # Verwenden Sie 'adopt' für Java 17
+
+    - name: Update Apt
+      run: apt update -y
+
+    - name: Update CA certificates
+      run: apt-get install --reinstall ca-certificates -y
+
+    - name: Install Maven
+      run: apt install maven -y
+
+    - name: Build with Maven
+      run: mvn clean install
+      
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: BetterMinecraft-stable.jar
+        path: target/BetterMinecraft-stable.jar
+        steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Get letzte Release-Version
+      id: get_version
+      run: echo "::set-output name=version::$(git describe --tags --abbrev=0 || echo '0.0.0')"
+
+    - name: Incrementiere Version
+      id: increment_version
+      run: |
+        IFS='.' read -ra VERSION <<< "${{ steps.get_version.outputs.version }}"
+        MAJOR="${VERSION[0]}"
+        MINOR="${VERSION[1]}"
+        PATCH="${VERSION[2]}"
+        echo "::set-output name=major::$(($MAJOR + 1))"
+        echo "::set-output name=minor::$(($MINOR + 1))"
+        echo "::set-output name=patch::$(($PATCH + 1))"
+
+    - name: Create Release
+      id: create_release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          target/BetterMinecraft-stable.jar
+        tag_name: ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        release_name: Release ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        draft: false
+        prerelease: false

.gitea/workflows/release.yml.off

@@ -0,0 +1,65 @@
+name: Build and Release Minecraft Plugin
+
+on:
+  push:
+    branches:
+      - Release
+
+jobs:
+  build:
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt' # Verwenden Sie 'adopt' für Java 17
+
+    - name: Update Apt
+      run: apt update -y
+
+    - name: Update CA certificates
+      run: apt-get install --reinstall ca-certificates -y
+
+    - name: Install Maven
+      run: apt install maven -y
+
+    - name: Build with Maven
+      run: mvn clean install
+      
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: BetterMinecraft-stable.jar
+        path: target/BetterMinecraft-stable.jar
+        steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Get letzte Release-Version
+      id: get_version
+      run: echo "::set-output name=version::$(git describe --tags --abbrev=0 || echo '0.0.0')"
+
+    - name: Incrementiere Version
+      id: increment_version
+      run: |
+        IFS='.' read -ra VERSION <<< "${{ steps.get_version.outputs.version }}"
+        MAJOR="${VERSION[0]}"
+        MINOR="${VERSION[1]}"
+        PATCH="${VERSION[2]}"
+        echo "::set-output name=major::$(($MAJOR + 1))"
+        echo "::set-output name=minor::$(($MINOR + 1))"
+        echo "::set-output name=patch::$(($PATCH + 1))"
+
+    - name: Create Release
+      id: create_release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          target/BetterMinecraft-stable.jar
+        tag_name: ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        release_name: Release ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        draft: false
+        prerelease: false

.gitea/workflows/test.md

@@ -1 +0,0 @@
-testtesttesttrest

.gitea/workflows/test.yml

@@ -1,60 +0,0 @@
-name: Build and Release Minecraft Plugin
-
-on:
-  push:
-    branches:
-      - Testing
-
-jobs:
-  build-and-release:
-    
-    steps:
-      # Repository auschecken
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      # Java 17 installieren
-      - name: Set up Java 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      # Maven installieren
-      - name: Install Maven
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y maven
-
-      # Plugin-Version aus plugin.yml auslesen
-      - name: Extract Plugin Version
-        id: extract_version
-        run: |
-          VERSION=$(grep '^version:' src/main/resources/plugin.yml | awk '{print $2}')
-          echo "PLUGIN_VERSION=$VERSION" >> $GITHUB_ENV
-
-      # Projekt mit Maven bauen
-      - name: Build with Maven
-        run: mvn clean package
-
-      # JAR-Datei umbenennen
-      - name: Rename JAR File
-        run: |
-          mv target/*.jar target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Artefakt hochladen
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Release erstellen
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          tag_name: ${{ env.PLUGIN_VERSION }}
-          release_name: Release ${{ env.PLUGIN_VERSION }}
-          draft: false
-          prerelease: true

changelog.txt

@@ -1,2 +0,0 @@
-+ added system type changelog
-+ added custom type changelog

pom.xml

@@ -37,7 +37,6 @@
         <directory>${project.basedir}/src/main/resources</directory>
         <includes>
           <include>plugin.yml</include>
-          <include>config.yml</include>
         </includes>
       </resource>
     </resources>

src/main/java/de/steev/bm/BetterMinecraft.java

@@ -41,7 +41,6 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
 		this.getLogger().info(prefix + ChatColor.WHITE + "Plugin Startet");
 		this.getLogger().info(prefix + ChatColor.WHITE + "Initializing Gamemanager");
 		gameManager = new GameManager(this);
-		this.saveDefaultConfig();
 
 		// Registers Events
 		this.getLogger().info(prefix + ChatColor.WHITE + "Lade Events");

src/main/java/de/steev/bm/Commands/back.java

@@ -17,14 +17,8 @@ public class back implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
-        if (!this.gameManager.getConfigManager().GetBool("back_command")) {
-            commandSender.sendMessage("back command ist nicht aktiv");
-            return false;
-        }
-
         Player player = (Player) commandSender.getServer().getPlayer(commandSender.getName());
         Location lastDeath;
-
         try {
             lastDeath = this.gameManager.getPlugin().getPlayerDataConfig().getLocation(player.getUniqueId() + ".death");
             player.teleport(lastDeath);
@@ -33,7 +27,6 @@ public class back implements CommandExecutor {
         } catch (Exception ex) {
             commandSender.sendMessage("Tot nicht gefunden!");
         }
-
         return false;
     }
 }

src/main/java/de/steev/bm/Interaction/replanting.java

@@ -36,12 +36,9 @@ public class replanting {
                 target.getLocation().getWorld().dropItem(loc, new ItemStack(item[0]));
             }
 
-            if (amount.length > 1) {
-                for (int i = 0; i < amount[1]; i++) {
-                    target.getLocation().getWorld().dropItem(loc, new ItemStack(item[1]));
-                }
+            for(int i = 0; i < amount[1]; i++) {
+                target.getLocation().getWorld().dropItem(loc, new ItemStack(item[1]));
             }
-
             crop.setAge(0);
             target.setBlockData(crop);
         }

src/main/java/de/steev/bm/Listener/BedListener.java

@@ -1,5 +1,6 @@
 package de.steev.bm.Listener;
 
+import de.steev.bm.BetterMinecraft;
 import de.steev.bm.Manager.GameManager;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -20,7 +21,7 @@ public class BedListener implements Listener {
     @EventHandler // Adding to the Player Variable
     public void onPlayerBedEnter(PlayerBedEnterEvent event) {
         final World world = event.getPlayer().getWorld();
-        if(world.getTime() >= 13000 || world.getThunderDuration() > 0 && this.gameManager.getConfigManager().GetBool("improved_bed")) {
+        if(world.getTime() >= 13000 || world.getThunderDuration() > 0) {
             this.gameManager.getPlugin().playerInBed++;
             // Checks if enough Players (currentSleeping >= OnlinePlayerAmount/2) are Sleeping
             if(this.gameManager.getPlugin().playerInBed >= (int)this.gameManager.getPlugin().getServer().getOnlinePlayers().size()/2) {
@@ -48,4 +49,5 @@ public class BedListener implements Listener {
             this.gameManager.getPlugin().playerInBed = 0;
         }
     }
+
 }

src/main/java/de/steev/bm/Listener/InteractListener.java

@@ -21,7 +21,7 @@ public class InteractListener implements Listener {
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event){
-        if(event.getAction().equals(Action.RIGHT_CLICK_BLOCK) && this.gameManager.getConfigManager().GetBool("replanting")){
+        if(event.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
 
             /** the clicked block */
             Block target = event.getClickedBlock();

src/main/java/de/steev/bm/Listener/KillListener.java

@@ -29,12 +29,12 @@ public class KillListener implements Listener {
         int[] amounts;
         Material[] drops;
 
-        if(event.getEntity() instanceof Player && this.gameManager.getConfigManager().GetBool("back_command")){
+        if(event.getEntity() instanceof Player){
             Location death = ((Player) event.getEntity()).getPlayer().getLocation();
             UUID uuid = ((Player) event.getEntity()).getPlayer().getUniqueId();
             this.gameManager.getPlugin().getPlayerDataConfig().set("" + uuid + ".death", death);
         } else if(event.getEntity() instanceof Animals) {
-            if(event.getEntity().toString() == "CraftPig" && this.gameManager.getConfigManager().GetBool("custom_drops")){
+            if(event.getEntity().toString() == "CraftPig"){
                 amounts = new int[]{ 2,2 };
                 drops = new Material[]{Material.LEATHER, Material.PORKCHOP};
                 Death.onAnimalDeath(amounts, drops, this.gameManager.getPlugin(), event);

src/main/java/de/steev/bm/Manager/ConfigManager.java

@@ -1,14 +0,0 @@
-package de.steev.bm.Manager;
-
-public class ConfigManager {
-
-    private GameManager gameManager;
-
-    public ConfigManager(GameManager gameManager) {
-        this.gameManager = gameManager;
-    }
-
-    public boolean GetBool(String Key){
-        return gameManager.getPlugin().getConfig().getBoolean(Key);
-    }
-}

src/main/java/de/steev/bm/Manager/GameManager.java

@@ -12,7 +12,6 @@ public class GameManager {
     private BetterMinecraft plugin;
     private RecipyManager recipyManager;
     private PlayerManager playerManager;
-    private ConfigManager configManager;
 
     /**
      * initilizes the Gamemanager and all systems beneath it
@@ -27,22 +26,20 @@ public class GameManager {
 
         this.recipyManager = new RecipyManager(this);
         this.playerManager = new PlayerManager(this);
-        this.configManager = new ConfigManager(this);
 
-        if (this.configManager.GetBool("custom_recipes")) {
-            this.plugin.getLogger().info("registring Recipies");
-            this.plugin.getLogger().info("saddle");
-            char[] s_ing = {'L', 'S', 'I', 'W'};
-            String[] s_rec = {"LLL", "SWS", "I I"};
-            Material[] s_mat = {Material.LEATHER, Material.STRING, Material.IRON_INGOT, Material.WHITE_WOOL};
-            this.recipyManager.RegisterNew(s_ing, s_mat, s_rec, 1, Material.SADDLE, "Saddle");
+        this.plugin.getLogger().info("registring Recipies");
+        this.plugin.getLogger().info("saddle");
+        char[] s_ing = { 'L', 'S', 'I', 'W' };
+        String[] s_rec = { "LLL", "SWS", "I I" };
+        Material[] s_mat = { Material.LEATHER, Material.STRING, Material.IRON_INGOT, Material.WHITE_WOOL};
+        this.recipyManager.RegisterNew(s_ing, s_mat, s_rec, 1, Material.SADDLE, "Saddle");
+
+        this.plugin.getLogger().info("String");
+        char[] w_ing = { 'W', 'F', };
+        String[] w_rec = { " W ", "WFW", " W " };
+        Material[] w_mat = { Material.WHITE_WOOL, Material.FLINT };
+        this.recipyManager.RegisterNew(w_ing, w_mat, w_rec, 4, Material.STRING, "String");
 
-            this.plugin.getLogger().info("String");
-            char[] w_ing = {'W', 'F',};
-            String[] w_rec = {" W ", "WFW", " W "};
-            Material[] w_mat = {Material.WHITE_WOOL, Material.FLINT};
-            this.recipyManager.RegisterNew(w_ing, w_mat, w_rec, 4, Material.STRING, "String");
-        }
     }
 
     public BetterMinecraft getPlugin(){
@@ -56,9 +53,5 @@ public class GameManager {
     public PlayerManager getPlayerManager() {
         return playerManager;
     }
-
-    public ConfigManager getConfigManager() {
-        return configManager;
-    }
 }
 

src/main/resources/config.yml

@@ -1,5 +0,0 @@
-improved_bed: true
-custom_drops: true
-custom_recipes: true
-replanting: true
-back_command: true