Add support for ItemsAdder.

TODO: finish readme with instructions for itemsadder. Closes #141.
TownyAdvanced · Jan 24, 2024 · b76c1a6 · b76c1a6
1 parent f7973a5
commit b76c1a6
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -89,6 +89,12 @@
       <version>6.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.LoneDev6</groupId>
+      <artifactId>api-itemsadder</artifactId>
+      <version>3.6.1</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.github.bsideup.jabel</groupId>
       <artifactId>jabel-javac-plugin</artifactId>

diff --git a/src/main/java/io/github/townyadvanced/townyresources/TownyResources.java b/src/main/java/io/github/townyadvanced/townyresources/TownyResources.java
@@ -41,7 +41,7 @@ public class TownyResources extends JavaPlugin {
 	private static boolean slimeFunInstalled;
 	private static boolean mythicMobsInstalled;
 	private static boolean mmmoItemsInstalled;
-
+	private static boolean itemsAdderInstalled;
 
 	public TownyResources() {
 		plugin = this;
@@ -222,6 +222,10 @@ public boolean isMythicMobsV5() {
 		return mythicMobsInstalled;
 	}
 
+	public boolean isItemsAdderInstalled() {
+		return itemsAdderInstalled;
+	}
+
 	public boolean isMMOItemsInstalled() {
 		return mmmoItemsInstalled;
 	}
@@ -264,6 +268,11 @@ private void setupIntegrationsWithOtherPlugins() {
 			}
 		}
 
+		Plugin itemsAdder = Bukkit.getPluginManager().getPlugin("ItemsAdder");
+		itemsAdderInstalled = itemsAdder != null;
+		if (itemsAdderInstalled)
+			info("  ItemsAdder Integration Enabled");
+
 		Plugin mmmoItems = Bukkit.getPluginManager().getPlugin("MMOItems");
 		mmmoItemsInstalled = mmmoItems != null;
 		if (mmmoItemsInstalled)

diff --git a/.../io/github/townyadvanced/townyresources/controllers/TownResourceCollectionController.java b/.../io/github/townyadvanced/townyresources/controllers/TownResourceCollectionController.java
@@ -7,6 +7,7 @@
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import io.github.townyadvanced.townyresources.TownyResources;
 import io.github.townyadvanced.townyresources.metadata.TownyResourcesGovernmentMetaDataController;
+import io.github.townyadvanced.townyresources.util.ItemsAdderUtil;
 import io.github.townyadvanced.townyresources.util.MMOItemsUtil;
 import io.github.townyadvanced.townyresources.util.MythicMobsUtil;
 import io.github.townyadvanced.townyresources.util.TownyResourcesMessagingUtil;
@@ -139,6 +140,17 @@ private static List<ItemStack> buildItemStackList(Player player, Set<Entry<Strin
             		continue;
             	}
             }
+
+            //  ItemsAdder integration
+            if (TownyResources.getPlugin().isItemsAdderInstalled()) {
+                ItemStack itemsAdderItem = ItemsAdderUtil.getItemStack(materialName, amount);
+                if (itemsAdderItem != null) {
+                    itemStack = itemsAdderItem;
+                    itemStackList.add(itemStack);
+                    continue;
+                }
+            }
+
             //Unknown material. Send error message
             TownyResourcesMessagingUtil.sendErrorMsg(player, Translatable.of("townyresources.msg_err_cannot_collect_unknown_material", materialName));
         }

diff --git a/src/main/java/io/github/townyadvanced/townyresources/settings/TownyResourcesSettings.java b/src/main/java/io/github/townyadvanced/townyresources/settings/TownyResourcesSettings.java
@@ -20,6 +20,7 @@
 import io.github.townyadvanced.townyresources.TownyResources;
 import io.github.townyadvanced.townyresources.objects.ResourceExtractionCategory;
 import io.github.townyadvanced.townyresources.objects.ResourceOfferCategory;
+import io.github.townyadvanced.townyresources.util.ItemsAdderUtil;
 import io.github.townyadvanced.townyresources.util.MMOItemsUtil;
 import io.github.townyadvanced.townyresources.util.MythicMobsUtil;
 
@@ -264,6 +265,11 @@ private static boolean isValidMaterial(String materialName) {
 		&& MMOItemsUtil.isValidItem(materialName))
 			return true;
 
+		// ItemsAdder integration
+		if (TownyResources.getPlugin().isItemsAdderInstalled() 
+		&& ItemsAdderUtil.isValidItem(materialName))
+			return true;
+
 		return false; //Unknown material		
 	}
 

diff --git a/src/main/java/io/github/townyadvanced/townyresources/util/ItemsAdderUtil.java b/src/main/java/io/github/townyadvanced/townyresources/util/ItemsAdderUtil.java
@@ -0,0 +1,30 @@
+package io.github.townyadvanced.townyresources.util;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import dev.lone.itemsadder.api.CustomStack;
+
+public class ItemsAdderUtil {
+
+	@Nullable
+	public static ItemStack getItemStack(String materialName, int amount) {
+		CustomStack itemsAdderItem = CustomStack.getInstance(materialName);
+		if (itemsAdderItem == null)
+			return null;
+		ItemStack itemStack = itemsAdderItem.getItemStack();
+		itemStack.setAmount(amount);
+		return itemStack;
+	}
+
+	public static String getMaterialNameForDisplay(String materialName) {
+		CustomStack itemsAdderItem = CustomStack.getInstance(materialName);
+		if (itemsAdderItem == null)
+			return null;
+		return itemsAdderItem.getDisplayName();
+	}
+
+	public static boolean isValidItem(String materialName) {
+		return CustomStack.getInstance(materialName) != null;
+	}
+}
diff --git a/src/main/java/io/github/townyadvanced/townyresources/util/TownyResourcesMessagingUtil.java b/src/main/java/io/github/townyadvanced/townyresources/util/TownyResourcesMessagingUtil.java
@@ -203,6 +203,14 @@ public static String formatMaterialNameForDisplay(String materialName) {
             	if (miName != null)
             		return miName;
             }
+
+            // ItemsAdder integration
+            if(TownyResources.getPlugin().isItemsAdderInstalled()) {
+                String mmName = ItemsAdderUtil.getMaterialNameForDisplay(materialName); 
+                if (mmName != null) {
+                    return mmName;
+                }
+            }
         } else {
             if(TownyResources.getPlugin().isLanguageUtilsInstalled()) {           
                 ItemStack fakeItemStack = new ItemStack(material);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -6,7 +6,7 @@ author: 'Goosius, LlmDL'
 website: 'https://github.com/TownyAdvanced/TownyResources'
 prefix: ${project.artifactId}
 depend: [Towny]
-softdepend: [SiegeWar,Dynmap-Towny,LangUtils,Slimefun,MythicMobs,MMOItems]
+softdepend: [SiegeWar,Dynmap-Towny,LangUtils,Slimefun,MythicMobs,MMOItems,ItemsAdder]
 folia-supported: true
 
 description: This is an add-on plugin for Towny, which gives each town a unique set of automatically-extracted resources, and then protects the economic value of those resources with moderate limits to player resource extraction.