WIP: More progress towards fixing tons of errors [ci skip]

Author: Skullians

README.md

@@ -18,6 +18,11 @@ All code credits go towards LOOHP, who has given permission for this fork to be
 > If you encounter bugs while using this fork, **do not report this to the original author!**\
 > You should create an issue for [this fork](https://github.com/TerraByteDev/MultiChat-DIscordSRV-Addon/issues).
 
+## Missing Features
+Right now, this fork does not support the following features (that the original plugin *does* support):
+- [ ] Proxy support
+- [ ] Image file previews from discord
+
 ## Built against Spigot
 Built against [Spigot's API](https://www.spigotmc.org/wiki/buildtools/) (required mc versions are listed on the spigot page above).
 Plugins built against Spigot usually also work with [Paper](https://papermc.io/).

common/pom.xml

@@ -524,6 +524,12 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.36</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>

common/src/main/java/com/loohp/multichatdiscordsrvaddon/InteractiveChatDiscordSrvAddon.java

@@ -22,10 +22,7 @@
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.loohp.multichatdiscordsrvaddon.config.Config;
-import com.loohp.multichatdiscordsrvaddon.objectholders.BuiltInPlaceholder;
-import com.loohp.multichatdiscordsrvaddon.objectholders.ICMaterial;
-import com.loohp.multichatdiscordsrvaddon.objectholders.ICPlaceholder;
-import com.loohp.multichatdiscordsrvaddon.objectholders.ValuePairs;
+import com.loohp.multichatdiscordsrvaddon.objectholders.*;
 import com.loohp.multichatdiscordsrvaddon.utils.MCVersion;
 import com.loohp.multichatdiscordsrvaddon.utils.VersionManager;
 import com.loohp.multichatdiscordsrvaddon.utils.*;
@@ -34,6 +31,7 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
@@ -280,13 +278,22 @@ public class InteractiveChatDiscordSrvAddon extends JavaPlugin implements Listen
     public boolean useTooltipOnTab = true;
     public String tabTooltip = "";
     public long universalCooldown = 0;
-
     public static ICPlaceholder itemPlaceholder = null;
     public static ICPlaceholder inventoryPlaceholder = null;
     public static ICPlaceholder enderChestPlaceholder = null;
-
+    public ItemStack invFrame1 = null;
+    public ItemStack invFrame2 = null;
     public static Map<UUID, ICPlaceholder> placeholderList = new LinkedHashMap<>();
 
+    public ConcurrentCacheHashMap<String, Inventory> itemDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
+    public ConcurrentCacheHashMap<String, Inventory> inventoryDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
+    public ConcurrentCacheHashMap<String, Inventory> inventoryDisplay1Upper = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
+    public ConcurrentCacheHashMap<String, Inventory> inventoryDisplay1Lower = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
+    public ConcurrentCacheHashMap<String, Inventory> enderDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
+    public ConcurrentCacheHashMap<String, ItemStack> mapDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
+    public Set<Inventory> upperSharedInventory = Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>()));
+    public Set<Inventory> lowerSharedInventory = Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>()));
+
     private ResourceManager resourceManager;
     public ModelRenderer modelRenderer;
     public ExecutorService mediaReadingService;
@@ -684,6 +691,9 @@ public void reloadConfig() {
             placeholderList.put(enderChestPlaceholder.getInternalId(), enderChestPlaceholder);
         }
 
+        invFrame1 = new ItemStack(Material.valueOf(getConfig().getString("InventoryImage.Inventory.Frame.Primary")), 1);
+        invFrame2 = new ItemStack(Material.valueOf(getConfig().getString("InventoryImage.Inventory.Frame.Secondary")), 1);
+
         universalCooldown = config.getConfiguration().getLong("Settings.UniversalCooldown") * 1000;
 
         FontTextureResource.setCacheTime(cacheTimeout);

common/src/main/java/com/loohp/multichatdiscordsrvaddon/api/InteractiveChatDiscordSrvAddonAPI.java

@@ -29,6 +29,7 @@
 import com.loohp.multichatdiscordsrvaddon.resources.ResourceManager;
 import com.loohp.multichatdiscordsrvaddon.wrappers.GraphicsToPacketMapWrapper;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.*;
@@ -131,6 +132,41 @@ public int getValue() {
 
     }
 
+    /**
+     * Add an inventory to the shared inventory list
+     *
+     * @param type
+     * @param hash key
+     * @param inventory
+     * @return The hashed key which can be used to retrieve the inventory
+     * @throws Exception
+     */
+    public static String addInventoryToItemShareList(SharedType type, String hash, Inventory inventory) throws Exception {
+        switch (type) {
+            case ITEM:
+                InteractiveChatDiscordSrvAddon.plugin.itemDisplay.put(hash, inventory);
+                InteractiveChatDiscordSrvAddon.plugin.upperSharedInventory.add(inventory);
+                break;
+            case INVENTORY:
+                InteractiveChatDiscordSrvAddon.plugin.inventoryDisplay.put(hash, inventory);
+                InteractiveChatDiscordSrvAddon.plugin.upperSharedInventory.add(inventory);
+                break;
+            case INVENTORY1_UPPER:
+                InteractiveChatDiscordSrvAddon.plugin.inventoryDisplay1Upper.put(hash, inventory);
+                InteractiveChatDiscordSrvAddon.plugin.upperSharedInventory.add(inventory);
+                break;
+            case INVENTORY1_LOWER:
+                InteractiveChatDiscordSrvAddon.plugin.inventoryDisplay1Lower.put(hash, inventory);
+                InteractiveChatDiscordSrvAddon.plugin.lowerSharedInventory.add(inventory);
+                break;
+            case ENDERCHEST:
+                InteractiveChatDiscordSrvAddon.plugin.enderDisplay.put(hash, inventory);
+                InteractiveChatDiscordSrvAddon.plugin.upperSharedInventory.add(inventory);
+                break;
+        }
+        return hash;
+    }
+
     /**
      * Get the placeholder list.
      *