src/main/java/xyz/soukup/mineconomiaCoreV2/MineconomiaCoreV2.java

@@ -24,6 +24,8 @@ public final class MineconomiaCoreV2 extends JavaPlugin {
 
     private static MineconomiaCoreV2 instance;
 
+    public static HashMap<Player, PlayerData> playersData = new HashMap<>();
+
     @Override
     public void onEnable() {
         // Plugin startup logic

src/main/java/xyz/soukup/mineconomiaCoreV2/commands/admin.java

@@ -1,6 +1,5 @@
 package xyz.soukup.mineconomiaCoreV2.commands;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -13,10 +12,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.soukup.mineconomiaCoreV2.tools.LangManager;
 import xyz.soukup.mineconomiaCoreV2.tools.PDC;
-import xyz.soukup.mineconomiaCoreV2.variables.Transaction;
 
 import java.io.IOException;
-import java.sql.SQLException;
 import java.util.List;
 
 import static xyz.soukup.mineconomiaCoreV2.core.sharedValues.config;
@@ -25,68 +22,27 @@ public class admin implements TabExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+        if (commandSender instanceof Player) {
 
+            Player player = (Player) commandSender;
 
-            if (!commandSender.isOp()) {
+            if (!player.isOp() || strings.length == 0) {
-                LangManager.message(commandSender, "error.command.no-permissions");
-                return false;
-            }
-
-            if (strings.length == 0){
-                LangManager.message(commandSender, "error.command.not-enough-arguments");
-            }
 
-            switch (strings[0].toLowerCase()){
+                LangManager.message(commandSender, "error.command.admin.setruleritem.no-permissions");
-                case "setruleritem":
-                    setRulerItem(commandSender);
                 return true;
-                case "givemoney":
-                    try {
-                        giveMoney(commandSender, strings);
-                    } catch (SQLException e) {
-                        throw new RuntimeException(e);
-                    }
-                    return true;
-
-            }
-
-        return false;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
-
-        if (strings.length == 1 && commandSender.isOp()) {
-            return List.of("setRulerItem", "giveMoney");
-        }
-
-        return List.of();
-    }
-
-    private void giveMoney(CommandSender commandSender, String[] strings) throws SQLException {
-        if (strings.length < 3){
-            LangManager.message(commandSender, "error.command.not-enough-arguments");
-            return;
             }
 
-        Float amount = Float.valueOf(strings[2]);
+            if (strings[0].equalsIgnoreCase("setRulerItem")) {
-
-        Transaction.prepareTransaction("server", "server", strings[1], "player", amount, "admin").process();
-        LangManager.message(commandSender, "success.command.admin.give-money");
-    }
-
-    private void setRulerItem(CommandSender commandSender){
-        Player player = (Player) commandSender;
 
                 ItemStack playerHand = player.getInventory().getItemInMainHand();
 
                 if (playerHand.getType() == Material.AIR) {
+
                     LangManager.message(commandSender, "error.command.admin.setruleritem.invalid-item");
-            return;
+                    return true;
                 }
 
                 ItemMeta meta = playerHand.getItemMeta();
-        assert meta != null;
                 PDC.WriteItemMetaPDC(meta, "ruler", PersistentDataType.INTEGER, 1);
                 playerHand.setItemMeta(meta);
 
@@ -99,6 +55,19 @@ public class admin implements TabExecutor {
                 }
 
                 LangManager.message(commandSender, "success.command.admin.setruleritem");
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
 
+        if (strings.length == 1 && commandSender.isOp()) {
+            return List.of("setRulerItem");
+        }
+
+        return List.of();
     }
 }

src/main/java/xyz/soukup/mineconomiaCoreV2/commands/money.java

@@ -1,21 +0,0 @@
-package xyz.soukup.mineconomiaCoreV2.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-public class money implements TabExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
-        return false;
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
-        return List.of();
-    }
-}

src/main/java/xyz/soukup/mineconomiaCoreV2/database/DatabaseUtil.java

@@ -6,7 +6,10 @@ import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
-import xyz.soukup.mineconomiaCoreV2.variables.*;
+import xyz.soukup.mineconomiaCoreV2.variables.Island;
+import xyz.soukup.mineconomiaCoreV2.variables.PlayerData;
+import xyz.soukup.mineconomiaCoreV2.variables.Shop;
+import xyz.soukup.mineconomiaCoreV2.variables.Transaction;
 
 import java.sql.SQLException;
 
@@ -18,8 +21,6 @@ public class DatabaseUtil {
     public static Dao<Island, Integer> islandDao;
     public static Dao<Shop, Integer> shopDao;
     public static Dao<Transaction, Integer> transactionDao;
-    public static Dao<Group, Integer> groupDao;
-    public static Dao<GroupMembership, Integer> groupMembershipDao;
 
     public static ConnectionSource getConnectionSource() throws SQLException {
         String host = config.getString("database.host");
@@ -38,8 +39,6 @@ public class DatabaseUtil {
             TableUtils.createTableIfNotExists(connectionSource, Transaction.class);
             TableUtils.createTableIfNotExists(connectionSource, Island.class);
             TableUtils.createTableIfNotExists(connectionSource, Shop.class);
-            TableUtils.createTableIfNotExists(connectionSource, Group.class);
-            TableUtils.createTableIfNotExists(connectionSource, GroupMembership.class);
     }
 
     public static void daoInit(ConnectionSource connectionSource) throws SQLException {
@@ -47,8 +46,6 @@ public class DatabaseUtil {
         playerDataDao = DaoManager.createDao(connectionSource, PlayerData.class);
         shopDao = DaoManager.createDao(connectionSource, Shop.class);
         transactionDao = DaoManager.createDao(connectionSource, Transaction.class);
-        groupDao = DaoManager.createDao(connectionSource, Group.class);
-        groupMembershipDao = DaoManager.createDao(connectionSource, GroupMembership.class);
     }
 
     public static void databaseInit() throws SQLException {

src/main/java/xyz/soukup/mineconomiaCoreV2/events/PlayerInit.java

@@ -10,8 +10,9 @@ import xyz.soukup.mineconomiaCoreV2.variables.PlayerData;
 
 import java.sql.SQLException;
 
+import static xyz.soukup.mineconomiaCoreV2.MineconomiaCoreV2.playersData;
+import static xyz.soukup.mineconomiaCoreV2.core.sharedValues.logger;
 import static xyz.soukup.mineconomiaCoreV2.database.DatabaseUtil.playerDataDao;
-import static xyz.soukup.mineconomiaCoreV2.variables.PlayerData.playersData;
 
 public class PlayerInit implements Listener {
 

src/main/java/xyz/soukup/mineconomiaCoreV2/variables/Group.java

@@ -1,66 +0,0 @@
-package xyz.soukup.mineconomiaCoreV2.variables;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.table.DatabaseTable;
-
-import java.sql.SQLException;
-
-import static xyz.soukup.mineconomiaCoreV2.database.DatabaseUtil.groupDao;
-
-@DatabaseTable(tableName = "groups")
-public class Group {
-
-    @DatabaseField(generatedId = true)
-    private int id;
-
-    @DatabaseField(unique = true)
-    private String name;
-
-    @DatabaseField(canBeNull = false)
-    private String owner;
-
-    @DatabaseField(canBeNull = false)
-    private float money;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getOwner() {
-        return owner;
-    }
-
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
-
-    public float getMoney() {
-        return money;
-    }
-
-    public void setMoney(float money) {
-        this.money = money;
-    }
-
-    public static Group getGroup(String name) throws SQLException {
-        QueryBuilder<Group, Integer> queryBuilder = groupDao.queryBuilder();
-        return queryBuilder.where().eq("name", name).queryForFirst();
-    }
-
-    public void save() throws SQLException {
-        groupDao.update(this);
-    }
-}

src/main/java/xyz/soukup/mineconomiaCoreV2/variables/GroupMembership.java

@@ -1,41 +0,0 @@
-package xyz.soukup.mineconomiaCoreV2.variables;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-@DatabaseTable(tableName = "group_memberships")
-public class GroupMembership {
-
-    @DatabaseField(generatedId = true)
-    private int id;
-
-    @DatabaseField(canBeNull = false)
-    private String group;
-
-    @DatabaseField(canBeNull = false)
-    private String member;
-
-    public String getGroup() {
-        return group;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    public String getMember() {
-        return member;
-    }
-
-    public void setMember(String member) {
-        this.member = member;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-}

src/main/java/xyz/soukup/mineconomiaCoreV2/variables/Island.java

@@ -9,16 +9,16 @@ public class Island {
     @DatabaseField(generatedId = true)
     private int id;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String server;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String name;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String owner;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String world;
 
     @DatabaseField(columnName = "size_x")

src/main/java/xyz/soukup/mineconomiaCoreV2/variables/PlayerData.java

@@ -3,36 +3,25 @@ package xyz.soukup.mineconomiaCoreV2.variables;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-import java.sql.SQLException;
-import java.util.HashMap;
-
-import static xyz.soukup.mineconomiaCoreV2.database.DatabaseUtil.playerDataDao;
-
 //Definování Member classy pro databázi a další manipulace
 
 @DatabaseTable(tableName = "players")
 public class PlayerData {
 
-    public static HashMap<Player, PlayerData> playersData = new HashMap<>();
-
     @DatabaseField(generatedId = true)
     private int id;
 
-    @DatabaseField(unique = true, canBeNull = false)
+    @DatabaseField(unique = true)
     private String nickname;
 
     @DatabaseField
     private int online;
 
-    @DatabaseField(canBeNull = false)
-    private float money;
-
     @DatabaseField
-    private String discord;
+    private float money;
 
 
     public int getId() {
@@ -67,38 +56,7 @@ public class PlayerData {
         this.money = money;
     }
 
-    public String getDiscord() {
+    public PlayerData(){
-        return discord;
-    }
-
-    public void setDiscord(String discord) {
-        this.discord = discord;
-    }
-
-    public static PlayerData getPlayerData(String nickname) throws SQLException {
-        PlayerData playerData = null;
-        Player player = Bukkit.getPlayer(nickname);
-
-        if (player != null){
-            playerData = playersData.get(player);
-        }
-
-        if (playerData == null){
-            playerData = playerDataDao.queryBuilder().where().eq("nickname", nickname).queryForFirst();
-        }
-
-        return playerData;
-    }
-
-    public void save() throws SQLException {
-        Player player = Bukkit.getPlayer(this.getNickname());
-
-        if (player != null){
-            playersData.put(player, this);
-            return;
-        }
-
-        playerDataDao.update(this);
 
     }
 

src/main/java/xyz/soukup/mineconomiaCoreV2/variables/Shop.java

@@ -8,46 +8,43 @@ public class Shop {
     @DatabaseField(generatedId = true)
     private int id;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String server;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String owner;
 
-    @DatabaseField(columnName = "owner_type", canBeNull = false)
+    @DatabaseField(columnName = "owner_type")
     private String ownerType;
 
-    @DatabaseField(columnName = "price_sell", canBeNull = false)
+    @DatabaseField
-    private String priceSell;
+    private String type;
 
-    @DatabaseField(columnName = "price_buy", canBeNull = false)
+    @DatabaseField
-    private float priceBuy;
+    private float price;
 
     @DatabaseField
     private int stock;
 
     @DatabaseField
-    private int space;
-
-    @DatabaseField(canBeNull = false)
     private int x;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private int y;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private int z;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private int world;
 
-    @DatabaseField(columnName = "storage_x", canBeNull = false)
+    @DatabaseField(columnName = "storage_x")
     private int storageX;
 
-    @DatabaseField(columnName = "storage_y", canBeNull = false)
+    @DatabaseField(columnName = "storage_y")
     private int storageY;
 
-    @DatabaseField(columnName = "storage_z", canBeNull = false)
+    @DatabaseField(columnName = "storage_z")
     private  int storageZ;
 
 

src/main/java/xyz/soukup/mineconomiaCoreV2/variables/Transaction.java

@@ -2,46 +2,36 @@ package xyz.soukup.mineconomiaCoreV2.variables;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import org.bukkit.entity.Player;
 
-import java.sql.SQLException;
 import java.util.Date;
 
-import static xyz.soukup.mineconomiaCoreV2.database.DatabaseUtil.transactionDao;
-
 @DatabaseTable(tableName = "transactions")
 public class Transaction {
 
     @DatabaseField(generatedId = true)
     private int id;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private Date date;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String type;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private float amount;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String sender;
 
-    @DatabaseField(columnName = "sender_type", canBeNull = false)
+    @DatabaseField(columnName = "sender_type")
     private String senderType;
 
-    @DatabaseField(canBeNull = false)
+    @DatabaseField
     private String receiver;
 
-    @DatabaseField(columnName = "receiver_type", canBeNull = false)
+    @DatabaseField(columnName = "receiver_type")
     private String receiverType;
 
-    @DatabaseField
-    private String s1;
-
-    @DatabaseField
-    private String s2;
-
     public int getId() {
         return id;
     }
@@ -106,131 +96,5 @@ public class Transaction {
         this.receiverType = receiverType;
     }
 
-    public String getS1(){
-        return s1;
-    }
-
-    public void setS1(String s1){
-        this.s1 = s1;
-    }
-
-    public String getS2(){
-        return s2;
-    }
-
-    public void  setS2(String s2){
-        this.s2 = s2;
-    }
-
-    public Boolean senderHasEnough() throws SQLException {
-        switch (this.senderType){
-            case "server":
-                return true;
-            case "group":
-                Group group = Group.getGroup(this.sender);
-
-                if (group == null){
-                    return false;
-                }
-
-                return group.getMoney() >= this.amount;
-
-            case "player":
-                PlayerData playerData = PlayerData.getPlayerData(this.sender);
-
-                if (playerData == null){
-                    return false;
-                }
-
-                return playerData.getMoney() >= this.amount;
-
-            default:
-                return false;
-
-
-        }
-    }
-
-    public void process() throws SQLException {
-
-        float money;
-
-        switch (this.senderType){
-            case "server":
-                break;
-            case "player":
-                PlayerData playerData = PlayerData.getPlayerData(this.sender);
-                money = playerData.getMoney();
-                playerData.setMoney(money - amount);
-                playerData.save();
-                break;
-            case "group":
-                Group group = Group.getGroup(this.sender);
-                money = group.getMoney();
-                group.setMoney(money - amount);
-                group.save();
-        }
-
-        switch (this.receiverType){
-            case "server":
-                break;
-            case "player":
-                PlayerData playerData = PlayerData.getPlayerData(this.receiver);
-                money = playerData.getMoney();
-                playerData.setMoney(money + amount);
-                playerData.save();
-                break;
-            case "group":
-                Group group = Group.getGroup(this.receiver);
-                money = group.getMoney();
-                group.setMoney(money + amount);
-                group.save();
-        }
-
-        this.setDate(new Date());
-
-        transactionDao.create(this);
-    }
-
-    public Boolean processIfSenderHasEnough() throws SQLException {
-        if (this.senderHasEnough()){
-            this.process();
-            return true;
-        }
-        return false;
-    };
-
-    public static Transaction prepareTransaction(String sender, String senderType, String receiver, String receiverType, Float amount, String type){
-        Transaction transaction = new Transaction();
-
-        transaction.setSender(sender);
-        transaction.setSenderType(senderType);
-        transaction.setReceiver(receiver);
-        transaction.setReceiverType(receiverType);
-        transaction.setAmount(amount);
-        transaction.setType(type);
-
-        return transaction;
-    }
-
-    public static Transaction prepareTransaction(String sender, String senderType, String receiver, String receiverType, Float amount, String type, String s1){
-        Transaction transaction = prepareTransaction(sender, senderType, receiver, receiverType, amount, type);
-        transaction.setS1(s1);
-        return transaction;
-    }
-    public static Transaction prepareTransaction(String sender, String senderType, String receiver, String receiverType, Float amount, String type, String s1, String s2){
-        Transaction transaction = prepareTransaction(sender, senderType, receiver, receiverType, amount, type, s1);
-        transaction.setS2(s2);
-        return transaction;
-    }
-
-    public static Transaction prepareTransaction(Player senderPlayer, Player receiverPlayer, Float amount){
-        String sender = senderPlayer.getDisplayName();
-        String receiver = receiverPlayer.getDisplayName();
-
-        return prepareTransaction(sender, "player", receiver, "player", amount, "playertoplayer");
-    }
-
-    
 
 }

src/main/resources/lang/czech.yml

@@ -5,8 +5,6 @@ error:
     wrong-argument-count: "&cNesprávný počet parametrů!"
     no-permissions: "&cNemáš oprávnění!"
     invalid-player: "&cTento hráč neexistuje!"
-    invalid-arguments: "&cChybně zadané parametry!"
-    not-enough-arguments: "&cNedostatek parametrů!"
     tpw:
       invalid-world: "&cTento svět neexistuje!"
       already-in-world-self: "&cJiž jsi v tomto světě"
@@ -14,7 +12,7 @@ error:
     admin:
       setruleritem:
         invalid-item: "&cNedržíš nic v ruce!"
-
+        no-permissions: "&cNemáš oprávnění!"
 success:
   command:
     tpw:

src/main/resources/plugin.yml

@@ -5,17 +5,9 @@ api-version: '1.21'
 commands:
   tpw:
     description: "Teleportuje tě do jiného světa"
-    usage: /tpw <world> [player]
+    usage: /<command> [arguments]
   tractor:
     description: "blieat"
   admin:
     description: "Utility command pro adminy"
-    usage: /admin <util>
+    usage: /<command> [arguments]
-  money:
-    description: "check current money balance"
-    usage: /money [player]
-    aliases: [penize, peníze, balance]
-  pay:
-    description: "let go of your money :D"
-    usage: /pay <player name/group> [group name] <amount>
-    aliases: [zaplatit, platit]