From f03714c95c867c9d027c5f31a5c93edfdaaad86c Mon Sep 17 00:00:00 2001
From: MeexReay <meexreay@gmail.com>
Date: Sat, 19 Apr 2025 23:03:27 +0300
Subject: [PATCH] fix give and remove items

---
 .gitignore                                    |   0
 .idea/.gitignore                              |   0
 .idea/gradle.xml                              |   3 +-
 .idea/misc.xml                                |   2 +-
 .idea/uiDesigner.xml                          |   0
 .idea/vcs.xml                                 |   2 +-
 LICENSE                                       |   0
 README.md                                     |   0
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin
 gradle/wrapper/gradle-wrapper.properties      |   0
 gradlew.bat                                   |   0
 settings.gradle                               |   0
 .../java/ru/themixray/itemeconomy/Config.java |   0
 .../java/ru/themixray/itemeconomy/Main.java   |  66 +++++++++++++++---
 .../ru/themixray/itemeconomy/VaultLayer.java  |  22 +-----
 src/main/resources/config.yml                 |   0
 17 files changed, 62 insertions(+), 35 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 .idea/.gitignore
 mode change 100644 => 100755 .idea/gradle.xml
 mode change 100644 => 100755 .idea/misc.xml
 mode change 100644 => 100755 .idea/uiDesigner.xml
 mode change 100644 => 100755 .idea/vcs.xml
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 build.gradle
 mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.jar
 mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.properties
 mode change 100644 => 100755 gradlew.bat
 mode change 100644 => 100755 settings.gradle
 mode change 100644 => 100755 src/main/java/ru/themixray/itemeconomy/Config.java
 mode change 100644 => 100755 src/main/java/ru/themixray/itemeconomy/Main.java
 mode change 100644 => 100755 src/main/java/ru/themixray/itemeconomy/VaultLayer.java
 mode change 100644 => 100755 src/main/resources/config.yml

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.idea/.gitignore b/.idea/.gitignore
old mode 100644
new mode 100755
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
old mode 100644
new mode 100755
index 14746e7..61bb70b
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -7,7 +8,7 @@
         <option name="gradleHome" value="" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$" />
+            <option value="/mnt/work/source/ItemEconomy" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
old mode 100644
new mode 100755
index f0c744c..477d1e2
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="temurin-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
old mode 100644
new mode 100755
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
old mode 100644
new mode 100755
index 94a25f7..35eb1dd
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
index 6e29dea..3d12fb8
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'ru.themixray.itemeconomy'
-version = '0.1.0'
+version = '0.1.1'
 
 spigot {
     desc {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
old mode 100644
new mode 100755
diff --git a/src/main/java/ru/themixray/itemeconomy/Config.java b/src/main/java/ru/themixray/itemeconomy/Config.java
old mode 100644
new mode 100755
diff --git a/src/main/java/ru/themixray/itemeconomy/Main.java b/src/main/java/ru/themixray/itemeconomy/Main.java
old mode 100644
new mode 100755
index 17340fa..14a6e65
--- a/src/main/java/ru/themixray/itemeconomy/Main.java
+++ b/src/main/java/ru/themixray/itemeconomy/Main.java
@@ -8,18 +8,33 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 public class Main extends JavaPlugin {
+    public static HashMap<String, List<ItemStack>> addItems = new HashMap<>();
+
     @Override
     public void onEnable() {
         Config.loadConfig(new UnrealConfig(this, getDataFolder(), "config.yml"));
         Bukkit.getServicesManager().register(Economy.class, new VaultLayer(), this, ServicePriority.High);
+        new BukkitRunnable() {
+            public void run() {
+                new HashMap<>(addItems).forEach((k, v) -> {
+                    Player player = Bukkit.getPlayerExact(k);
+
+                    if (player != null) {
+                        for (ItemStack item : v) {
+                            addItems(player, item);
+                        }
+
+                        addItems.remove(k);
+                    }
+                });
+            }
+        }.runTaskTimer(this, 20, 20);
     }
 
     @Override
@@ -31,14 +46,43 @@ public class Main extends JavaPlugin {
         return Arrays.stream(player.getInventory().getContents()).map(o -> o == null ? new ItemStack(Material.AIR) : o).toList();
     }
 
-    public static boolean removeItems(Player player, Material type, int amount) {
-        if(player.getInventory().all(type).values().stream().mapToInt(ItemStack::getAmount).sum()<amount)return false;
-        player.getInventory().removeItem(new ItemStack(type,amount));
-        return true;
+    public static boolean removeItems(String playerName, Material type, int amount) {
+        System.out.println("try remove item "+type+" "+amount+" from "+playerName);
+        ItemStack item = new ItemStack(type, amount);
+
+        Player player = Bukkit.getPlayerExact(playerName);
+
+        if (player == null) {
+            return false;
+        } else {
+            return removeItems(player, item);
+        }
     }
 
-    public static void addItems(Player player, Material type, int amount) {
-        HashMap<Integer, ItemStack> nope=player.getInventory().addItem(new ItemStack(type,amount));
-        for(ItemStack v:nope.values())player.getWorld().dropItemNaturally(player.getLocation(),v);
+    public static void addItems(String playerName, Material type, int amount) {
+        System.out.println("try add item "+type+" "+amount+" to "+playerName);
+        ItemStack item = new ItemStack(type, amount);
+
+        Player player = Bukkit.getPlayerExact(playerName);
+
+        if (player == null) {
+            List<ItemStack> items = addItems.getOrDefault(playerName, new ArrayList<>());
+            items.add(item);
+            addItems.put(playerName, items);
+        } else {
+            addItems(player, item);
+        }
+    }
+
+    private static boolean removeItems(Player player, ItemStack item) {
+        System.out.println("remove item "+item.getType()+" "+item.getAmount()+" from "+player.getName());
+        if (player.getInventory().all(item.getType()).values().stream().mapToInt(ItemStack::getAmount).sum() < item.getAmount()) return false;
+        return player.getInventory().removeItem(item).isEmpty();
+    }
+
+    private static void addItems(Player player, ItemStack item) {
+        System.out.println("add item "+item.getType()+" "+item.getAmount()+" from "+player.getName());
+        HashMap<Integer, ItemStack> nope = player.getInventory().addItem(item);
+        for (ItemStack v:nope.values()) player.getWorld().dropItemNaturally(player.getLocation(), v);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ru/themixray/itemeconomy/VaultLayer.java b/src/main/java/ru/themixray/itemeconomy/VaultLayer.java
old mode 100644
new mode 100755
index b49ccb4..6b0b351
--- a/src/main/java/ru/themixray/itemeconomy/VaultLayer.java
+++ b/src/main/java/ru/themixray/itemeconomy/VaultLayer.java
@@ -83,16 +83,7 @@ public class VaultLayer implements Economy {
                 EconomyResponse.ResponseType.FAILURE,
                 "Недостаточно средств");
 
-        Player player;
-        if ((player = Bukkit.getPlayer(playerName)) == null) {
-            return new EconomyResponse(
-                    amount,
-                    getBalance(playerName),
-                    EconomyResponse.ResponseType.FAILURE,
-                    "Игрок офлайн");
-        }
-
-        if (!Main.removeItems(player, Config.ITEM, (int) amount)) {
+        if (!Main.removeItems(playerName, Config.ITEM, (int) Math.ceil(amount))) {
             return new EconomyResponse(
                     amount,
                     getBalance(playerName),
@@ -112,16 +103,7 @@ public class VaultLayer implements Economy {
         if (amount == 0) return new EconomyResponse(amount,getBalance(playerName),EconomyResponse.ResponseType.SUCCESS,null);
         if (amount < 0) return withdrawPlayer(playerName,-amount);
 
-        Player player;
-        if ((player = Bukkit.getPlayer(playerName)) == null) {
-            return new EconomyResponse(
-                    amount,
-                    getBalance(playerName),
-                    EconomyResponse.ResponseType.FAILURE,
-                    "Игрок офлайн");
-        }
-
-        Main.addItems(player, Config.ITEM, (int) amount);
+        Main.addItems(playerName, Config.ITEM, (int) amount);
 
         return new EconomyResponse(
                 amount,
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
old mode 100644
new mode 100755