From 05c4914c790f32ea51b35e5dbf8f1e0b2ac6cd65 Mon Sep 17 00:00:00 2001 From: DrParadox7 Date: Thu, 9 Nov 2023 17:59:51 +0100 Subject: [PATCH] Mails are now checked for prohibited items Added blacklist for Mail envelopes. It's mainly there to prevent players bypassing the stamp cost by sending out inventories rather than items. --- src/main/java/forestry/Forestry.java | 3 ++ .../java/forestry/core/config/Config.java | 53 +++++++++++++++++++ .../mail/inventory/ItemInventoryLetter.java | 3 +- 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index c7fb349a7..4cd2bfcf9 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -112,6 +112,9 @@ public class Forestry { public void postInit(FMLPostInitializationEvent event) { PluginManager.runPostInit(); + // Parse Mail Blacklist + Config.parseMailBlacklist(); + // Register world generator WorldGenerator worldGenerator = new WorldGenerator(); GameRegistry.registerWorldGenerator(worldGenerator, 0); diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index dec42f573..f6f745b13 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -15,14 +15,17 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Properties; import java.util.Set; +import net.minecraft.item.Item; import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.Property; import com.google.common.collect.LinkedListMultimap; +import cpw.mods.fml.common.registry.GameRegistry; import forestry.Forestry; import forestry.core.fluids.Fluids; import forestry.core.utils.Log; @@ -97,6 +100,37 @@ public class Config { public static GuiMailboxInfo.XPosition mailAlertXPosition = GuiMailboxInfo.XPosition.LEFT; public static GuiMailboxInfo.YPosition mailAlertYPosition = GuiMailboxInfo.YPosition.TOP; + public static List mailBlacklist = new ArrayList(); + public static String[] mailBlacklistString; + public static final String[] mailBlacklistDefault = new String[] { "arsmagica2:essenceBag", "arsmagica2:runeBag", + "betterstorage:backpack", "betterstorage:cardboardBox", "betterstorage:thaumcraftBackpack", + "Botania:baubleBox", "Botania:flowerBag", "cardboardboxes:cbCardboardBox", "dendrology:fullDrawers1", + "dendrology:fullDrawers2", "dendrology:fullDrawers4", "dendrology:halfDrawers2", "dendrology:halfDrawers4", + "DQMIIINext:ItemMahounoTutu11", "DQMIIINext:ItemOokinaFukuro", "DQMIIINext:ItemOokinaFukuroB", + "DQMIIINext:ItemOokinaFukuroG", "DQMIIINext:ItemOokinaFukuroR", "DQMIIINext:ItemOokinaFukuroY", + "ExtraUtilities:golden_bag", "HardcoreEnderExpansion:charm_pouch", "ImmersiveEngineering:toolbox", + "ironbackpacks:basicBackpack", "ironbackpacks:diamondBackpack", "ironbackpacks:goldBackpack", + "ironbackpacks:ironBackpack", "JABBA:mover", "JABBA:moverDiamond", "MagicBees:backpack.thaumaturgeT1", + "MagicBees:backpack.thaumaturgeT2", "Mekanism:CardboardBox", "MineFactoryReloaded:plastic.bag", + "OpenBlocks:devnull", "ProjectE:item.pe_alchemical_bag", + "ProjRed|Exploration:projectred.exploration.backpack", "sgs_treasure:dread_pirate_chest", + "sgs_treasure:iron_chest", "sgs_treasure:locked_wooden_chest", "sgs_treasure:obsidian_chest", + "sgs_treasure:pirate_chest", "sgs_treasure:wither_chest", "sgs_treasure:wooden_chest", + "StorageDrawers:compDrawers", "StorageDrawers:fullCustom1", "StorageDrawers:fullCustom2", + "StorageDrawers:fullCustom4", "StorageDrawers:fullDrawers1", "StorageDrawers:fullDrawers2", + "StorageDrawers:fullDrawers4", "StorageDrawers:halfCustom2", "StorageDrawers:halfCustom4", + "StorageDrawers:halfDrawers2", "StorageDrawers:halfDrawers4", "StorageDrawersBop:fullDrawers1", + "StorageDrawersBop:fullDrawers1", "StorageDrawersBop:fullDrawers2", "StorageDrawersBop:fullDrawers2", + "StorageDrawersBop:fullDrawers4", "StorageDrawersBop:fullDrawers4", "StorageDrawersBop:halfDrawers2", + "StorageDrawersBop:halfDrawers2", "StorageDrawersBop:halfDrawers4", "StorageDrawersBop:halfDrawers4", + "StorageDrawersForestry:fullDrawers1A", "StorageDrawersForestry:fullDrawers2A", + "StorageDrawersForestry:fullDrawers4A", "StorageDrawersForestry:halfDrawers2A", + "StorageDrawersForestry:halfDrawers4A", "StorageDrawersNatura:fullDrawers1", + "StorageDrawersNatura:fullDrawers2", "StorageDrawersNatura:fullDrawers4", + "StorageDrawersNatura:halfDrawers2", "StorageDrawersNatura:halfDrawers4", "Thaumcraft:FocusPouch", + "ThaumicTinkerer:ichorPouch", "thebetweenlands:lurkerSkinPouch", "ThermalExpansion:Strongbox", + "ThermalExpansion:satchel", "warpbook:warpbook", "witchery:brewbag", "WitchingGadgets:item.WG_Bag" }; + // Gui tabs (Ledger) public static int guiTabSpeed = 8; @@ -279,6 +313,11 @@ public class Config { "yPosition", mailAlertYPosition, GuiMailboxInfo.YPosition.values()); + mailBlacklistString = configCommon.getStringList( + "mailBlacklist", + "restrictions", + mailBlacklistDefault, + "Items that cannot be shipped through a letter"); guiTabSpeed = configCommon.getIntLocalized("tweaks.gui.tabs", "speed", guiTabSpeed, 1, 50); enableHints = configCommon.getBooleanLocalized("tweaks.gui.tabs", "hints", enableHints); @@ -386,4 +425,18 @@ public class Config { return list.split("[;]+"); } } + + public static void parseMailBlacklist() { + for (String itemName : mailBlacklistString) { + String[] nameAndID; + if (itemName.contains(":") && (nameAndID = itemName.split(":")).length == 2) { + Item item = GameRegistry.findItem(nameAndID[0], nameAndID[1]); + if (item != null) { + if (!mailBlacklist.contains(item)) { + mailBlacklist.add(item); + } + } + } + } + } } diff --git a/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java b/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java index a8175314a..5140231f3 100644 --- a/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java +++ b/src/main/java/forestry/mail/inventory/ItemInventoryLetter.java @@ -120,7 +120,8 @@ public class ItemInventoryLetter extends ItemInventory implements IErrorSource, Item item = itemStack.getItem(); return item instanceof ItemStamps; } else if (SlotUtil.isSlotInRange(slotIndex, Letter.SLOT_ATTACHMENT_1, Letter.SLOT_ATTACHMENT_COUNT)) { - return !(itemStack.getItem() instanceof ItemWithGui); + if (itemStack.getItem() instanceof ItemWithGui) return false; + return !Config.mailBlacklist.contains(itemStack.getItem()); } return false; }