diff --git a/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java old mode 100755 new mode 100644 index 2365c8b8b..29a4e80ec --- a/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java @@ -10,8 +10,8 @@ ******************************************************************************/ package forestry.apiculture.gadgets; -import java.util.ArrayList; import java.util.HashSet; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -22,35 +22,29 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ITileStructure; -import forestry.core.config.ForestryBlock; import forestry.core.gadgets.BlockStructure.EnumStructureState; import forestry.core.gadgets.StructureLogic; import forestry.core.utils.Schemata; import forestry.core.utils.Schemata.EnumStructureBlock; -import forestry.core.utils.StackUtils; import forestry.core.vect.Vect; public class StructureLogicAlveary extends StructureLogic { /* CONSTANTS */ public static final String UID_ALVEARY = "alveary"; - public static final Schemata SCHEMATA_ALVEARY = new Schemata("alveary3x3", 5, 6, 5, "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FAAAF", - "FAAAF", "FABAF", "FCCCF", "FFFFF", "FFFFF", "FAAAF", "FAAAF", "FBMBF", "FCCCF", "FFFFF", "FFFFF", "FAAAF", "FAAAF", "FABAF", "FCCCF", "FFFFF", + public static final Schemata SCHEMATA_ALVEARY = new Schemata("alveary3x3", 5, 6, 5, + "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", + "FFFFF", "FAAAF", "FAAAF", "FABAF", "FCCCF", "FFFFF", + "FFFFF", "FAAAF", "FAAAF", "FBMBF", "FCCCF", "FFFFF", + "FFFFF", "FAAAF", "FAAAF", "FABAF", "FCCCF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF", "FFFFF").setOffsets(-2, -3, -2); - public static final HashSet slabBlocks = new HashSet(); + private static final Set slabBlocks = new HashSet(); + private static final Set slabOreDictIds = new HashSet(); static { - slabBlocks.add(Blocks.wooden_slab); - slabBlocks.add(ForestryBlock.slabs1.block()); - slabBlocks.add(ForestryBlock.slabs2.block()); - slabBlocks.add(ForestryBlock.slabs3.block()); - slabBlocks.add(ForestryBlock.slabs4.block()); - ArrayList slabs = OreDictionary.getOres("slabWood"); - for (ItemStack slab : slabs) { - slabBlocks.add(StackUtils.getBlock(slab)); - } - + int slabWoodId = OreDictionary.getOreID("slabWood"); + slabOreDictIds.add(slabWoodId); } public StructureLogicAlveary(ITileStructure structure) { @@ -110,7 +104,7 @@ public class StructureLogicAlveary extends StructureLogic { } break; case BLOCK_C: - if (!slabBlocks.contains(block)) { + if (!isWoodSlabBlock(block)) { return EnumStructureState.INVALID; } if ((structureTile.getWorldObj().getBlockMetadata(x, y, z) & 8) != 0) { @@ -137,4 +131,19 @@ public class StructureLogicAlveary extends StructureLogic { return EnumStructureState.VALID; } + private static boolean isWoodSlabBlock(Block block) { + int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block)); + for (int oreId : oreIds) { + if (slabOreDictIds.contains(oreId)) { + return true; + } + } + + return slabBlocks.contains(block); + } + + public static void addSlabBlock(Block block) { + slabBlocks.add(block); + } + } diff --git a/src/main/java/forestry/core/gadgets/StructureLogic.java b/src/main/java/forestry/core/gadgets/StructureLogic.java index 345f68de4..5254f28aa 100755 --- a/src/main/java/forestry/core/gadgets/StructureLogic.java +++ b/src/main/java/forestry/core/gadgets/StructureLogic.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.gadgets; -import java.util.HashMap; +import java.util.EnumMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -32,7 +32,7 @@ public abstract class StructureLogic implements IStructureLogic { protected Schemata[] schematas; protected short activeSchemata = -1; protected boolean isRotated = false; - protected HashMap metaOnValid = new HashMap(); + protected EnumMap metaOnValid = new EnumMap(EnumStructureBlock.class); public StructureLogic(String uid, ITileStructure structure) { this.uid = uid; diff --git a/src/main/java/forestry/core/utils/Schemata.java b/src/main/java/forestry/core/utils/Schemata.java index c2593d544..40ea5f47b 100755 --- a/src/main/java/forestry/core/utils/Schemata.java +++ b/src/main/java/forestry/core/utils/Schemata.java @@ -19,7 +19,7 @@ public class Schemata { private final char key; - private EnumStructureBlock(char key) { + EnumStructureBlock(char key) { this.key = key; } diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index 3735b2a4c..948f2d9e3 100755 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -26,6 +26,7 @@ import forestry.core.interfaces.IPickupHandler; import forestry.core.interfaces.IResupplyHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.network.IPacketHandler; +import forestry.core.proxy.Proxies; public abstract class ForestryPlugin { @@ -60,6 +61,26 @@ public abstract class ForestryPlugin { return false; } + protected static String getInvalidIMCMessageText(IMCMessage message) { + final Object messageValue; + if (message.isItemStackMessage()) { + messageValue = message.getItemStackValue().toString(); + } else if (message.isNBTMessage()) { + messageValue = message.getNBTValue(); + } else if (message.isStringMessage()) { + messageValue = message.getStringValue(); + } else { + messageValue = ""; + } + + return String.format("Received an invalid '%s' request '%s' from mod '%s'. Please contact the author and report this issue.", message.key, messageValue, message.getSender()); + } + + protected static void logInvalidIMCMessage(IMCMessage message) { + String invalidIMCMessageText = getInvalidIMCMessageText(message); + Proxies.log.warning(invalidIMCMessageText); + } + public IGuiHandler getGuiHandler() { return null; } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 22080800d..3fee153c9 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -15,8 +15,6 @@ import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.List; import java.util.Random; -import java.util.logging.Level; -import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -902,30 +900,26 @@ public class PluginApiculture extends ForestryPlugin { if (message.key.equals("add-candle-lighting-id")) { ItemStack value = message.getItemStackValue(); if (value != null) { - ((BlockCandle) ForestryBlock.candle.block()).addItemToLightingList(value.getItem()); + BlockCandle.addItemToLightingList(value.getItem()); } else { - Logger.getLogger("Forestry").log(Level.WARNING, - "Received an invalid 'add-candle-lighting-id' request from mod %s. Please contact the author and report this issue.", - message.getSender()); + logInvalidIMCMessage(message); } return true; } else if (message.key.equals("add-alveary-slab") && message.isStringMessage()) { try { Block block = GameData.getBlockRegistry().getRaw(message.getStringValue()); - if (block == null || block == Blocks.air) { - Logger.getLogger("Forestry").log(Level.WARNING, - "Received an invalid 'add-alveary-slab' request from mod %s. Please contact the author and report this issue.", - message.getSender()); + if (block != null && block != Blocks.air) { + StructureLogicAlveary.addSlabBlock(block); } else { - StructureLogicAlveary.slabBlocks.add(block); + logInvalidIMCMessage(message); } } catch (Exception e) { - Logger.getLogger("Forestry").log(Level.WARNING, - "Received an invalid 'add-alveary-slab' request from mod %s. Please contact the author and report this issue.", - message.getSender()); + logInvalidIMCMessage(message); } + return true; } + return super.processIMCMessage(message); } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 7c7d0c080..edfb352ad 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -56,7 +56,6 @@ import forestry.arboriculture.FruitProviderPod.EnumPodType; import forestry.arboriculture.FruitProviderRandom; import forestry.arboriculture.FruitProviderRipening; import forestry.arboriculture.GuiHandlerArboriculture; -import forestry.arboriculture.network.PacketHandlerArboriculture; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodType; import forestry.arboriculture.commands.CommandTree; @@ -97,6 +96,7 @@ import forestry.arboriculture.items.ItemLeavesBlock; import forestry.arboriculture.items.ItemStairs; import forestry.arboriculture.items.ItemTreealyzer; import forestry.arboriculture.items.ItemWoodBlock; +import forestry.arboriculture.network.PacketHandlerArboriculture; import forestry.arboriculture.proxy.ProxyArboriculture; import forestry.arboriculture.worldgen.WorldGenAcacia; import forestry.arboriculture.worldgen.WorldGenAcaciaVanilla; @@ -1235,11 +1235,12 @@ public class PluginArboriculture extends ForestryPlugin { if (message.key.equals("add-fence-block") && message.isStringMessage()) { Block block = GameData.getBlockRegistry().getRaw(message.getStringValue()); - if (block == null || block == Blocks.air) { - Proxies.log.warning("invalid add-fence-block IMC: can't resolve block name %s.", message.getStringValue()); - } else { + if (block != null && block != Blocks.air) { validFences.add(block); + } else { + logInvalidIMCMessage(message); } + return true; } return super.processIMCMessage(message); } diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 0faf6d04e..7ff8e6c92 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -33,7 +33,6 @@ import forestry.api.farming.Farmables; import forestry.api.farming.IFarmable; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; -import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; @@ -193,21 +192,20 @@ public class PluginFarming extends ForestryPlugin { if (message.key.equals("add-farmable-sapling")) { String[] tokens = message.getStringValue().split("@"); - String errormsg = String.format("Received an invalid 'add-farmable-sapling' request '%s' from mod %s", message.getStringValue(), - message.getSender()); + String errormsg = getInvalidIMCMessageText(message); if (tokens.length != 2) { - Proxies.log.info(errormsg + "."); + Proxies.log.warning(errormsg); return true; } if (!Farmables.farmables.containsKey(tokens[0])) { - Proxies.log.info("%s for non-existent farm %s.", errormsg, tokens[0]); + Proxies.log.warning("%s For non-existent farm %s.", errormsg, tokens[0]); return true; } String[] items = tokens[1].split("[\\.]+"); if (items.length != 2 && items.length != 4) { - Proxies.log.info("%s for farm '%s': id definitions did not match.", errormsg, tokens[0]); + Proxies.log.warning("%s For farm '%s': id definitions did not match.", errormsg, tokens[0]); return true; } @@ -230,27 +228,27 @@ public class PluginFarming extends ForestryPlugin { new ItemStack(windfall, 1, Integer.parseInt(items[3])))); } } catch (Exception ex) { - Proxies.log.info("%s for farm '%s': ", errormsg, tokens[0], ex.getMessage()); + Proxies.log.warning("%s for farm '%s': %s", errormsg, tokens[0], ex.getMessage()); } return true; } else if (message.key.equals("add-farmable-crop")) { String[] tokens = message.getStringValue().split("@"); - String errormsg = String.format("Received an invalid 'add-farmable-crop' request '%s' from mod %s", message.getStringValue(), message.getSender()); + String errormsg = getInvalidIMCMessageText(message); if (tokens.length != 2) { - Proxies.log.info(errormsg + "."); + Proxies.log.warning(errormsg); return true; } if (!Farmables.farmables.containsKey(tokens[0])) { - Proxies.log.info("%s for non-existent farm %s.", errormsg, tokens[0]); + Proxies.log.warning("%s For non-existent farm %s.", errormsg, tokens[0]); return true; } String[] items = tokens[1].split("[\\.]+"); if (items.length != 4) { - Proxies.log.info("%s for farm '%s': id definitions did not match.", errormsg, tokens[0]); + Proxies.log.warning("%s For farm '%s': id definitions did not match.", errormsg, tokens[0]); return true; } @@ -269,7 +267,7 @@ public class PluginFarming extends ForestryPlugin { crop, Integer.parseInt(items[3]))); } catch (Exception ex) { - Proxies.log.info("%s for farm '%s': ", errormsg, tokens[0], ex.getMessage()); + Proxies.log.warning("%s for farm '%s': %s", errormsg, tokens[0], ex.getMessage()); } return true; diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index a2222241f..adb25dbb0 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -13,8 +13,6 @@ package forestry.plugins; import java.awt.Color; import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.block.BlockBasePressurePlate; @@ -268,16 +266,13 @@ public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandl if (message.key.equals("add-backpack-items")) { String[] tokens = message.getStringValue().split("@"); if (tokens.length != 2) { - Logger.getLogger("Forestry").log(Level.INFO, - String.format("Received an invalid 'add-backpack-items' request %s from mod %s", message.getStringValue(), message.getSender())); + logInvalidIMCMessage(message); return true; } if (!BackpackManager.definitions.containsKey(tokens[0])) { - Logger.getLogger("Forestry").log( - Level.INFO, - String.format("Received an invalid 'add-backpack-items' request %s from mod %s for non-existent backpack %s.", - message.getStringValue(), message.getSender(), tokens[0])); + String errorMessage = getInvalidIMCMessageText(message); + Proxies.log.warning("%s For non-existent backpack %s.", errorMessage, tokens[0]); return true; }