11 Commits

7 changed files with 65 additions and 4 deletions

View File

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

View File

@@ -4,11 +4,13 @@ import de.steev.bm.Commands.back;
import de.steev.bm.Listener.BedListener; import de.steev.bm.Listener.BedListener;
import de.steev.bm.Listener.InteractListener; import de.steev.bm.Listener.InteractListener;
import de.steev.bm.Listener.KillListener; import de.steev.bm.Listener.KillListener;
import de.steev.bm.Listener.PrepareAnvilListener;
import de.steev.bm.Manager.GameManager; import de.steev.bm.Manager.GameManager;
import de.steev.bm.utils.Config; import de.steev.bm.utils.Config;
import de.steev.bm.utils.exceptions.ConfigEntryExceptions; import de.steev.bm.utils.exceptions.ConfigEntryExceptions;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -43,6 +45,7 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this); this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this);
this.getServer().getPluginManager().registerEvents(new KillListener(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 InteractListener(this.gameManager), this);
this.getServer().getPluginManager().registerEvents(new PrepareAnvilListener(this.gameManager), this);
this.getServer().getPluginManager().registerEvents(this, this); this.getServer().getPluginManager().registerEvents(this, this);
Objects.requireNonNull(this.getCommand("back")).setExecutor(new back(this.gameManager)); Objects.requireNonNull(this.getCommand("back")).setExecutor(new back(this.gameManager));
@@ -88,4 +91,8 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
// Even more Messaging // Even more Messaging
this.getLogger().info(ChatColor.AQUA + "Ich geh dann mal :c"); this.getLogger().info(ChatColor.AQUA + "Ich geh dann mal :c");
} }
public FileConfiguration getPlayerDataConfig() {
return this.playerData.getConfig();
}
} }

View File

@@ -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;
}
}

View File

@@ -32,7 +32,7 @@ public class KillListener implements Listener {
if(event.getEntity() instanceof Player && this.gameManager.getConfigManager().GetBool("back_command")){ if(event.getEntity() instanceof Player && this.gameManager.getConfigManager().GetBool("back_command")){
Location death = ((Player) event.getEntity()).getPlayer().getLocation(); Location death = ((Player) event.getEntity()).getPlayer().getLocation();
UUID uuid = ((Player) event.getEntity()).getPlayer().getUniqueId(); 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) { } else if(event.getEntity() instanceof Animals) {
if(event.getEntity().toString() == "CraftPig" && this.gameManager.getConfigManager().GetBool("custom_drops")){ if(event.getEntity().toString() == "CraftPig" && this.gameManager.getConfigManager().GetBool("custom_drops")){
amounts = new int[]{ 2,2 }; amounts = new int[]{ 2,2 };

View File

@@ -0,0 +1,21 @@
package de.steev.bm.Listener;
import de.steev.bm.BetterMinecraft;
import org.bukkit.event.EventHandler;
import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.bukkit.inventory.AnvilInventory;
public class PrepareAnvilListener {
private BetterMinecraft plugin;
public PrepareAnvilListener(BetterMinecraft plugin) {
this.plugin = plugin;
}
@EventHandler
public void onPrepare(PrepareAnvilEvent event) {
AnvilInventory inv = event.getInventory();
inv.setMaximumRepairCost(Integer.MAX_VALUE);
}
}

View File

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