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

Reviewed-on: #83

.gitea/workflows/release.yml

@@ -3,11 +3,10 @@ name: Build and Release Minecraft Plugin
 on:
   push:
     branches:
-      - testing
+      - Resting
 
 jobs:
   build-and-release:
-    runs-on: self-hosted
 
     steps:
       # Repository auschecken
@@ -58,4 +57,4 @@ jobs:
           tag_name: ${{ env.PLUGIN_VERSION }}
           release_name: Release ${{ env.PLUGIN_VERSION }}
           draft: false
-          prerelease: true
+          prerelease: false

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;
@@ -40,11 +42,12 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
 
 		// 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
@@ -88,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/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/Listener/BedListener.java

@@ -8,12 +8,14 @@ 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;
     }
 

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

@@ -11,11 +11,13 @@ 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;
     }
 

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;
     }
 
@@ -32,7 +34,7 @@ public class KillListener implements Listener {
         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" && this.gameManager.getConfigManager().GetBool("custom_drops")){
                 amounts = new int[]{ 2,2 };

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/resources/config.yml

@@ -0,0 +1,17 @@
+# sets minimum players in bed to 50% of the server instead of requiring all players to be in bed
+improved_bed: true
+
+# fixes anvil cost beeing to expensive after 40 level
+anvil_fix: true
+
+# adds additional drops to some mobds
+custom_drops: true
+
+# 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: