From f0bcc683b239206ad423f168224fb10682fcdb79 Mon Sep 17 00:00:00 2001 From: jakub Date: Tue, 9 Apr 2024 09:01:36 +0200 Subject: [PATCH] =?UTF-8?q?Okomentov=C3=A1n=C3=AD=20n=C4=9Bkter=C3=BDch=20?= =?UTF-8?q?=C4=8D=C3=A1st=C3=AD=20k=C3=B3du?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++++++++----------- .../mineconomiacore/MineconomiaCore.java | 2 ++ .../xyz/mineconomia/mineconomiacore/PDC.java | 3 +++ .../mineconomiacore/commands/BookCommand.java | 4 ++++ .../mineconomiacore/commands/mcore.java | 2 +- .../mineconomia/mineconomiacore/database.java | 1 + .../mineconomiacore/events/specialEvents.java | 2 +- .../mineconomiacore/handlers/FHBHandler.java | 2 ++ .../mineconomiacore/handlers/SignHandler.java | 3 +++ 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index bded03c..f7bfe23 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ 4.0.0 xyz.mineconomia - MineconomiaCOre + MineconomiaCore 1.0-SNAPSHOT jar MineconomiaCore - 1.8 + 1.17 UTF-8 @@ -70,6 +70,12 @@ + + org.spigotmc + spigot-api + 1.18.2-R0.1-SNAPSHOT + provided + com.github.MilkBowl VaultAPI @@ -81,18 +87,9 @@ arangodb-java-driver 6.13.0 - - org.spigotmc - spigot-api - 1.20-R0.1-SNAPSHOT - provided - + - - org.hibernate.orm - hibernate-core - 6.3.0.Final - + org.jetbrains diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java b/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java index 60d140e..03406c7 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java @@ -24,6 +24,8 @@ public final class MineconomiaCore extends JavaPlugin { // Plugin startup logic saveDefaultConfig(); MineconomiaCore plugin= getPlugin(MineconomiaCore.class); + + //Tohle třeba změnit později - jakub Logger logger= plugin.getLogger(); logger.info(" "); logger.info(" ╔═══════════════════╗"); diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/PDC.java b/src/main/java/xyz/mineconomia/mineconomiacore/PDC.java index 4fe0af9..6475ae4 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/PDC.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/PDC.java @@ -6,10 +6,13 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; + +//Used by other classes for easy manipulation with persistentDataContainer public class PDC { + public static void WritePlayerPDC(Player player, String key, PersistentDataType type, Object value){ NamespacedKey nKey = new NamespacedKey(MineconomiaCore.getPlugin(MineconomiaCore.class), key); PersistentDataContainer pdc = player.getPersistentDataContainer(); diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java b/src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java index f1ddce3..013a6c1 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java @@ -9,7 +9,11 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import xyz.upperlevel.spigot.book.BookUtil; + + public class BookCommand implements CommandExecutor { + + //Experimentální. Bude se měnit @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { if (sender instanceof Player) { diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/commands/mcore.java b/src/main/java/xyz/mineconomia/mineconomiacore/commands/mcore.java index 0867911..32d3a02 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/commands/mcore.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/commands/mcore.java @@ -25,7 +25,7 @@ public class mcore implements CommandExecutor { ItemStack item = inventory.getItemInMainHand(); ItemMeta meta = item.getItemMeta(); assert meta != null; - PDC.WriteItemMetaPDC(meta, "special", PersistentDataType.BOOLEAN,true); + PDC.WriteItemMetaPDC(meta, "special", PersistentDataType.INTEGER,1); item.setItemMeta(meta); config.set("special.item", item); try { diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/database.java b/src/main/java/xyz/mineconomia/mineconomiacore/database.java index 71d4db5..c9b1bd9 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/database.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/database.java @@ -7,6 +7,7 @@ import org.bukkit.configuration.file.FileConfiguration; public interface database { FileConfiguration config = MineconomiaCore.getPlugin(MineconomiaCore.class).getConfig(); + //creates public db session that can be acessed by the rest of plugin ArangoDB arangodb = new ArangoDB.Builder() .host(config.getString("database.host"), config.getInt("database.port")) .user(config.getString("database.user")) diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/events/specialEvents.java b/src/main/java/xyz/mineconomia/mineconomiacore/events/specialEvents.java index 9e542ec..8501314 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/events/specialEvents.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/events/specialEvents.java @@ -114,7 +114,7 @@ public class specialEvents implements Listener { bossBar.removePlayer(player); } private static boolean isSpecial(ItemStack itemStack){ - return PDC.GetItemMetaPDC(Objects.requireNonNull(itemStack.getItemMeta()), "special", PersistentDataType.BOOLEAN) != null; + return PDC.GetItemMetaPDC(Objects.requireNonNull(itemStack.getItemMeta()), "special", PersistentDataType.INTEGER) != null; } } diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/handlers/FHBHandler.java b/src/main/java/xyz/mineconomia/mineconomiacore/handlers/FHBHandler.java index 1bf8487..d547c65 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/handlers/FHBHandler.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/handlers/FHBHandler.java @@ -16,6 +16,8 @@ import java.util.Random; import java.util.concurrent.TimeUnit; public class FHBHandler implements Listener { + + //experimentální... musí být později upraveno @EventHandler public void onFHBHit(ProjectileHitEvent event) throws InterruptedException { if (event.getEntity() instanceof Snowball){ diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/handlers/SignHandler.java b/src/main/java/xyz/mineconomia/mineconomiacore/handlers/SignHandler.java index 30ce621..a819a8d 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/handlers/SignHandler.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/handlers/SignHandler.java @@ -5,7 +5,10 @@ import org.bukkit.block.Block; import org.bukkit.block.Sign; import org.bukkit.block.BlockState; + public class SignHandler { + + //Implement for public static void changeSignText(Location location, String line0, String line1, String line2, String line3) { Block block = location.getBlock(); BlockState state = block.getState();