From 5961ea6d76740f0ede145ca69428a46dc85ea014 Mon Sep 17 00:00:00 2001 From: Lomeli12 Date: Wed, 25 Mar 2015 00:06:52 -0700 Subject: [PATCH] Allow black listing of items via IMC Messages. --- .../java/vazkii/botania/common/Botania.java | 5 ++++ .../common/core/handler/IMCHandler.java | 24 +++++++++++++++++++ .../item/equipment/bauble/ItemMagnetRing.java | 4 ++++ .../vazkii/botania/common/lib/LibMisc.java | 3 +++ 4 files changed, 36 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/core/handler/IMCHandler.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index e93c3bd30..f0a036a89 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -67,6 +67,11 @@ public class Botania { ManaNetworkHandler.instance.clear(); } + @EventHandler + public void handleIMC(FMLInterModComms.IMCEvent event) { + IMCHandler.processMessages(event.getMessages()); + } + /*@EventHandler public void missingMappings(FMLMissingMappingsEvent event) { AliasHandler.onMissingMappings(event); diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java new file mode 100644 index 000000000..68d903eda --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -0,0 +1,24 @@ +package vazkii.botania.common.core.handler; + +import com.google.common.collect.ImmutableList; + +import java.util.Iterator; + +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; + +import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; +import vazkii.botania.common.lib.LibMisc; + +public final class IMCHandler { + + public static void processMessages(ImmutableList messageList) { + Iterator iterator = messageList.iterator(); + while (iterator.hasNext()) { + IMCMessage message = iterator.next(); + if (message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { + String value = message.getStringValue(); + ItemMagnetRing.addItemToBlackList(value); + } + } + } +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 499e2a3e4..e0c279196 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -130,6 +130,10 @@ public class ItemMagnetRing extends ItemBauble { public static void setCooldown(ItemStack stack, int cooldown) { ItemNBTHelper.setInt(stack, TAG_COOLDOWN, cooldown); } + + public static void addItemToBlackList(String item) { + BLACKLIST.add(item); + } @Override public BaubleType getBaubleType(ItemStack arg0) { diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 11d0f2260..0f5dd4275 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -29,6 +29,9 @@ public final class LibMisc { public static final String PROXY_CLIENT = "vazkii.botania.client.core.proxy.ClientProxy"; public static final String GUI_FACTORY = "vazkii.botania.client.core.proxy.GuiFactory"; + // IMC Keys + public static final String BLACKLIST_ITEM = "blackListItem"; + public static final ForgeDirection[] CARDINAL_DIRECTIONS = new ForgeDirection[] { ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST };