Merge pull request 'bugfix/remove_anvill_costcap' (#83) from bugfix/remove_anvill_costcap into Testing

Reviewed-on: #83

.gitea/workflows/release.yml

@@ -0,0 +1,60 @@
+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

@@ -1,65 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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

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

.gitea/workflows/test.yml

@@ -0,0 +1,60 @@
+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

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

pom.xml

@@ -37,6 +37,7 @@
         <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

@@ -4,11 +4,13 @@ import de.steev.bm.Commands.back;
 import de.steev.bm.Listener.BedListener;
 import de.steev.bm.Listener.InteractListener;
 import de.steev.bm.Listener.KillListener;
+import de.steev.bm.Listener.PrepareAnvilListener;
 import de.steev.bm.Manager.GameManager;
 import de.steev.bm.utils.Config;
 import de.steev.bm.utils.exceptions.ConfigEntryExceptions;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -36,14 +38,16 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
 		this.getLogger().info(prefix + ChatColor.WHITE + "Plugin Startup");
 		this.getLogger().info(prefix + ChatColor.WHITE + "Initializing Gamemanager");
 		gameManager = new GameManager(this);
+		this.saveDefaultConfig();
 
 		// Registers Events
 		this.getLogger().info(prefix + ChatColor.WHITE + "Load Events");
+
 		this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this);
 		this.getServer().getPluginManager().registerEvents(new KillListener(this.gameManager), this);
 		this.getServer().getPluginManager().registerEvents(new InteractListener(this.gameManager), this);
+		this.getServer().getPluginManager().registerEvents(new PrepareAnvilListener(this.gameManager), this);
 		this.getServer().getPluginManager().registerEvents(this, this);
-
 		Objects.requireNonNull(this.getCommand("back")).setExecutor(new back(this.gameManager));
 
 		// PlayerData
@@ -87,4 +91,8 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
 		// Even more Messaging
 		this.getLogger().info(ChatColor.AQUA + "Ich geh dann mal :c");
 	}
+
+	public FileConfiguration getPlayerDataConfig() {
+		return this.playerData.getConfig();
+	}
 }

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

@@ -17,8 +17,14 @@ 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);
@@ -27,6 +33,7 @@ public class back implements CommandExecutor {
         } catch (Exception ex) {
             commandSender.sendMessage("Tot nicht gefunden!");
         }
+
         return false;
     }
 }

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

@@ -0,0 +1,29 @@
+package de.steev.bm.Interaction;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.Repairable;
+
+public class AnvilCalculator {
+    public static int getRepairCost(ItemStack item) {
+        if (item == null || item.getType().isAir()) return 0;
+        ItemMeta meta = item.getItemMeta();
+        if (meta instanceof Repairable) {
+            Repairable r = (Repairable) meta;
+            return r.getRepairCost(); // default 0 wenn nicht gesetzt
+        }
+        return 0;
+    }
+
+    public static ItemStack setRepairCost(ItemStack item, int cost) {
+        if (item == null || item.getType().isAir()) return item;
+        ItemMeta meta = item.getItemMeta();
+        if (meta instanceof Repairable) {
+            Repairable r = (Repairable) meta;
+            r.setRepairCost(cost);
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+}

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

@@ -36,9 +36,12 @@ public class replanting {
                 target.getLocation().getWorld().dropItem(loc, new ItemStack(item[0]));
             }
 
-            for(int i = 0; i < amount[1]; i++) {
+            if (amount.length > 1) {
-                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,6 +1,5 @@
 package de.steev.bm.Listener;
 
-import de.steev.bm.BetterMinecraft;
 import de.steev.bm.Manager.GameManager;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -9,19 +8,21 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerBedEnterEvent;
 import org.bukkit.event.player.PlayerBedLeaveEvent;
 
+import static de.steev.bm.utils.Constants.prefix;
+
 public class BedListener implements Listener {
 
     private GameManager gameManager;
 
     public BedListener(GameManager gameManager) {
-        gameManager.getPlugin().getLogger().info("Bed Listener Registered");
+        gameManager.getPlugin().getLogger().info(prefix + "Bed Listener Registered");
         this.gameManager = gameManager;
     }
 
     @EventHandler // Adding to the Player Variable
     public void onPlayerBedEnter(PlayerBedEnterEvent event) {
         final World world = event.getPlayer().getWorld();
-        if(world.getTime() >= 13000 || world.getThunderDuration() > 0) {
+        if(world.getTime() >= 13000 || world.getThunderDuration() > 0 && this.gameManager.getConfigManager().GetBool("improved_bed")) {
             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) {
@@ -49,5 +50,4 @@ public class BedListener implements Listener {
             this.gameManager.getPlugin().playerInBed = 0;
         }
     }
-
 }

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

@@ -11,17 +11,19 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
+import static de.steev.bm.utils.Constants.prefix;
+
 public class InteractListener implements Listener {
     private GameManager gameManager;
 
     public InteractListener(GameManager gameManager){
-        gameManager.getPlugin().getLogger().info("Initializing Interaction Listener");
+        gameManager.getPlugin().getLogger().info(prefix + "Initializing Interaction Listener");
         this.gameManager = gameManager;
     }
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event){
-        if(event.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
+        if(event.getAction().equals(Action.RIGHT_CLICK_BLOCK) && this.gameManager.getConfigManager().GetBool("replanting")){
 
             /** the clicked block */
             Block target = event.getClickedBlock();

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

@@ -11,12 +11,14 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
 import java.util.UUID;
 
+import static de.steev.bm.utils.Constants.prefix;
+
 public class KillListener implements Listener {
 
     private GameManager gameManager;
 
     public KillListener(GameManager gameManager) {
-        gameManager.getPlugin().getLogger().info("Mob Death events Registered");
+        gameManager.getPlugin().getLogger().info(prefix + "Mob Death events Registered");
         this.gameManager = gameManager;
     }
 
@@ -29,12 +31,12 @@ public class KillListener implements Listener {
         int[] amounts;
         Material[] drops;
 
-        if(event.getEntity() instanceof Player){
+        if(event.getEntity() instanceof Player && this.gameManager.getConfigManager().GetBool("back_command")){
             Location death = ((Player) event.getEntity()).getPlayer().getLocation();
             UUID uuid = ((Player) event.getEntity()).getPlayer().getUniqueId();
-            this.gameManager.getPlugin().getPlayerDataConfig().set("" + uuid + ".death", death);
+            this.gameManager.getPlugin().getPlayerDataConfig().set(uuid + ".death", death);
         } else if(event.getEntity() instanceof Animals) {
-            if(event.getEntity().toString() == "CraftPig"){
+            if(event.getEntity().toString() == "CraftPig" && this.gameManager.getConfigManager().GetBool("custom_drops")){
                 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/Listener/PrepareAnvilListener.java

@@ -0,0 +1,32 @@
+package de.steev.bm.Listener;
+
+import de.steev.bm.BetterMinecraft;
+import de.steev.bm.Manager.GameManager;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.PrepareAnvilEvent;
+import org.bukkit.inventory.AnvilInventory;
+import org.bukkit.inventory.view.AnvilView;
+
+import static de.steev.bm.utils.Constants.prefix;
+
+public class PrepareAnvilListener implements Listener {
+
+    private GameManager gameManager;
+
+    public PrepareAnvilListener(GameManager gameManager) {
+        gameManager.getPlugin().getLogger().info(prefix + "initializing Anvil CostCap fix");
+        this.gameManager = gameManager;
+    }
+
+    @EventHandler
+    public void onPrepare(PrepareAnvilEvent event) {
+        if (this.gameManager.getConfigManager().GetBool("anvil_fix")) {
+            AnvilView inv = event.getView();
+            this.gameManager.getPlugin().getLogger().info(prefix + "repaircost:" + inv.getRepairCost());
+            inv.setMaximumRepairCost(Integer.MAX_VALUE);
+            inv.getPlayer().sendMessage("repair cost: " + inv.getRepairCost());
+            inv.setRepairCost(inv.getRepairCost());
+        }
+    }
+}

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

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

src/main/resources/config.yml

@@ -1,13 +1,17 @@
-# changelog
+# sets minimum players in bed to 50% of the server instead of requiring all players to be in bed
-system_changelog: true
+improved_bed: true
-system_changelog_location: https://git.slpnetwork.de/Steev/betterminecraft/src/branch/main/changelog.txt
-custom_changelog: true
-custom_changelog_location: custom_changelog.txt
 
-# features
+# fixes anvil cost beeing to expensive after 40 level
-changelog: true # if this is toggled the whole changelog system is enabled or disabled
+anvil_fix: true
-improved_bed: true # toggles whether the night should be skipped when half the server players sleep
+
-custom_drops: false # toggles if custom drops should be enabled
+# adds additional drops to some mobds
-custom_recipes: false # toggles if custom recipes should be enabled
+custom_drops: true
-replanting: true # toggles the right click replant feature
+
-back_command: true # toggles the back to death point feature
+# adds custom crafting recipes
+custom_recipes: true
+
+# enables forge like replanting
+replanting: true
+
+# enables /back command
+back_command: true

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: BetterMinecraft
 main: de.steev.bm.BetterMinecraft
-version: 1.2.2
+version: 1.2.2-b2
 api-version: 1.21
 commands:
   back: