diff --git a/src/main/java/forestry/core/items/ItemRegistry.java b/src/main/java/forestry/core/items/ItemRegistry.java index 78138d05e..26362a2d7 100644 --- a/src/main/java/forestry/core/items/ItemRegistry.java +++ b/src/main/java/forestry/core/items/ItemRegistry.java @@ -11,8 +11,10 @@ package forestry.core.items; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; import forestry.core.utils.StringUtil; import forestry.plugins.PluginManager; @@ -26,4 +28,8 @@ public abstract class ItemRegistry { GameRegistry.registerItem(item, StringUtil.cleanItemName(item)); return item; } + + protected static void registerOreDict(String oreDictName, ItemStack itemStack) { + OreDictionary.registerOre(oreDictName, itemStack); + } } diff --git a/src/main/java/forestry/mail/LetterProperties.java b/src/main/java/forestry/mail/LetterProperties.java index 484c39627..7da66df58 100644 --- a/src/main/java/forestry/mail/LetterProperties.java +++ b/src/main/java/forestry/mail/LetterProperties.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.mail; +import java.util.ArrayList; import java.util.List; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -24,6 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; import forestry.api.mail.ILetter; +import forestry.mail.items.ItemLetter; import forestry.plugins.PluginMail; public class LetterProperties { @@ -110,15 +112,20 @@ public class LetterProperties { manager.registerItemModel(item, new LetterMeshDefinition()); } - @SuppressWarnings("unchecked") - public static void getSubItems(Item item, CreativeTabs tab, List list) { - for (State state : State.values()) { - for (Size size : Size.values()) { - int meta = encodeMeta(state, size); - ItemStack letter = new ItemStack(item, 1, meta); - list.add(letter); - } + public static void getSubItems(Item item, CreativeTabs tab, List list) { + int meta = encodeMeta(State.FRESH, Size.EMPTY); + ItemStack letter = new ItemStack(item, 1, meta); + list.add(letter); + } + + public static List getEmptiedLetters(ItemLetter item) { + List openedLetters = new ArrayList<>(); + for (Size size : Size.values()) { + int meta = encodeMeta(State.EMPTIED, size); + ItemStack letter = new ItemStack(item, 1, meta); + openedLetters.add(letter); } + return openedLetters; } private static State getState(int meta) { diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index 22b2796d8..4aa754726 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -77,10 +77,14 @@ public class ItemLetter extends ItemWithGui { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { LetterProperties.getSubItems(item, tab, list); } + public List getEmptiedLetters() { + return LetterProperties.getEmptiedLetters(this); + } + @Override public Object getGui(EntityPlayer player, ItemStack heldItem, int data) { return new GuiLetter(player, new ItemInventoryLetter(player, heldItem)); diff --git a/src/main/java/forestry/mail/items/ItemRegistryMail.java b/src/main/java/forestry/mail/items/ItemRegistryMail.java index e6258c1ef..21cc1c2f9 100644 --- a/src/main/java/forestry/mail/items/ItemRegistryMail.java +++ b/src/main/java/forestry/mail/items/ItemRegistryMail.java @@ -10,9 +10,13 @@ ******************************************************************************/ package forestry.mail.items; +import net.minecraft.item.ItemStack; + import forestry.core.items.ItemRegistry; public class ItemRegistryMail extends ItemRegistry { + public static final String emptiedLetterOreDict = "emptiedLetter"; + public final ItemStamps stamps; public final ItemLetter letters; public final ItemCatalogue catalogue; @@ -21,5 +25,9 @@ public class ItemRegistryMail extends ItemRegistry { stamps = registerItem(new ItemStamps(), "stamps"); letters = registerItem(new ItemLetter(), "letters"); catalogue = registerItem(new ItemCatalogue(), "catalogue"); + + for (ItemStack itemStack : letters.getEmptiedLetters()) { + registerOreDict(emptiedLetterOreDict, itemStack); + } } } diff --git a/src/main/java/forestry/plugins/BlankForestryPlugin.java b/src/main/java/forestry/plugins/BlankForestryPlugin.java index 9a1b7ceb4..f38e90fc3 100644 --- a/src/main/java/forestry/plugins/BlankForestryPlugin.java +++ b/src/main/java/forestry/plugins/BlankForestryPlugin.java @@ -13,10 +13,12 @@ package forestry.plugins; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.HashSet; +import java.util.List; import java.util.Random; import java.util.Set; import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -106,6 +108,10 @@ public abstract class BlankForestryPlugin implements IForestryPlugin { public void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ) { } + @Override + public void getHiddenItems(List hiddenItems) { + } + @Nullable @Override public ISaveEventHandler getSaveEventHandler() { diff --git a/src/main/java/forestry/plugins/IForestryPlugin.java b/src/main/java/forestry/plugins/IForestryPlugin.java index 62ce19e36..e50aa0510 100644 --- a/src/main/java/forestry/plugins/IForestryPlugin.java +++ b/src/main/java/forestry/plugins/IForestryPlugin.java @@ -2,10 +2,12 @@ package forestry.plugins; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.List; import java.util.Random; import java.util.Set; import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -56,6 +58,8 @@ public interface IForestryPlugin { void populateChunkRetroGen(World world, Random rand, int chunkX, int chunkZ); + void getHiddenItems(List hiddenItems); + @Nullable ISaveEventHandler getSaveEventHandler(); diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 946b1537e..6db155720 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -50,8 +50,8 @@ import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.TreeFactory; -import forestry.arboriculture.genetics.TreeRoot; import forestry.arboriculture.genetics.TreeMutationFactory; +import forestry.arboriculture.genetics.TreeRoot; import forestry.arboriculture.genetics.TreekeepingMode; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.genetics.alleles.AlleleLeafEffect; @@ -388,6 +388,12 @@ public class PluginArboriculture extends BlankForestryPlugin { return super.processIMCMessage(message); } + @Override + public void getHiddenItems(List hiddenItems) { + // sapling itemBlock is different from the normal item + hiddenItems.add(new ItemStack(blocks.saplingGE)); + } + private static void registerDungeonLoot() { ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.grafter.getItemStack(), 1, 1, 8)); diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 95ab31554..92ba97502 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -330,6 +330,12 @@ public class PluginCore extends BlankForestryPlugin { return new FuelHandler(); } + @Override + public void getHiddenItems(List hiddenItems) { + // research note items are not useful without actually having completed research + hiddenItems.add(new ItemStack(PluginCore.items.researchNote)); + } + private static class FuelHandler implements IFuelHandler { @Override diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 2dd3abb1a..53cac9409 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -12,6 +12,7 @@ package forestry.plugins; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -31,6 +32,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; @@ -350,7 +352,13 @@ public class PluginFarming extends BlankForestryPlugin { ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.APATITE, 1), Circuit.farmShroomManual); ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1), Circuit.farmCocoaManual); } - + + @Override + public void getHiddenItems(List hiddenItems) { + // mushrooms are a workaround for the farm and should not be obtainable + hiddenItems.add(new ItemStack(blocks.mushroom, 1, OreDictionary.WILDCARD_VALUE)); + } + @SubscribeEvent @SideOnly(Side.CLIENT) public void handleTextureRemap(TextureStitchEvent.Pre event) { diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index eb55090e2..541a6c8ff 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -127,7 +127,7 @@ public class PluginMail extends BlankForestryPlugin { } // Recycling - RecipeUtil.addRecipe(new ItemStack(Items.paper), "###", '#', items.letters.getWildcard()); + RecipeUtil.addRecipe(new ItemStack(Items.paper), "###", '#', ItemRegistryMail.emptiedLetterOreDict); // Carpenter RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.getFluid(250), null, items.letters.getItemStack(), "###", "###", '#', PluginCore.items.woodPulp); diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 76a42a4de..22aa8be0d 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -27,6 +27,7 @@ import java.util.Set; import net.minecraft.command.CommandHandler; import net.minecraft.command.ICommand; +import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -287,6 +288,15 @@ public class PluginManager { } } + @Nonnull + public static List getHiddenItems() { + List hiddenItems = new ArrayList<>(); + for (IForestryPlugin plugin : loadedPlugins) { + plugin.getHiddenItems(hiddenItems); + } + return hiddenItems; + } + private static boolean isEnabled(Configuration config, IForestryPlugin plugin) { ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); diff --git a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java new file mode 100644 index 000000000..cce013917 --- /dev/null +++ b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java @@ -0,0 +1,27 @@ +package forestry.plugins.compat; + +import javax.annotation.Nonnull; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import forestry.plugins.PluginManager; + +import mezz.jei.api.BlankModPlugin; +import mezz.jei.api.IItemBlacklist; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.JEIPlugin; + +@JEIPlugin +public class ForestryJeiPlugin extends BlankModPlugin { + @Override + public void register(@Nonnull IModRegistry registry) { + IJeiHelpers jeiHelpers = registry.getJeiHelpers(); + IItemBlacklist itemBlacklist = jeiHelpers.getItemBlacklist(); + List hiddenItems = PluginManager.getHiddenItems(); + for (ItemStack hiddenItem : hiddenItems) { + itemBlacklist.addItemToBlacklist(hiddenItem); + } + } +}