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

Reviewed-on: #73

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

@@ -4,13 +4,11 @@ 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;
@@ -42,12 +40,11 @@ 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
@@ -91,8 +88,4 @@ 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/Listener/BedListener.java

@@ -8,14 +8,12 @@ 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(prefix + "Bed Listener Registered");
+        gameManager.getPlugin().getLogger().info("Bed Listener Registered");
         this.gameManager = gameManager;
     }
 

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

@@ -11,13 +11,11 @@ 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(prefix + "Initializing Interaction Listener");
+        gameManager.getPlugin().getLogger().info("Initializing Interaction Listener");
         this.gameManager = gameManager;
     }
 

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

@@ -11,14 +11,12 @@ 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(prefix + "Mob Death events Registered");
+        gameManager.getPlugin().getLogger().info("Mob Death events Registered");
         this.gameManager = gameManager;
     }
 
@@ -34,7 +32,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

@@ -1,32 +1,21 @@
 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 {
 
-public class PrepareAnvilListener implements Listener {
+    private BetterMinecraft plugin;
 
-    private GameManager gameManager;
-
-    public PrepareAnvilListener(GameManager gameManager) {
-        gameManager.getPlugin().getLogger().info(prefix + "initializing Anvil CostCap fix");
-        this.gameManager = gameManager;
+    public PrepareAnvilListener(BetterMinecraft plugin) {
+        this.plugin = plugin;
     }
 
     @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());
+        AnvilInventory inv = event.getInventory();
         inv.setMaximumRepairCost(Integer.MAX_VALUE);
-            inv.getPlayer().sendMessage("repair cost: " + inv.getRepairCost());
-            inv.setRepairCost(inv.getRepairCost());
-        }
     }
 }

src/main/resources/config.yml

@@ -1,17 +1,5 @@
-# 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-b2
+version: 1.2.2
 api-version: 1.21
 commands:
   back: