diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index a36bc6e57..215cc9dfb 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.corporea; import java.util.Random; +import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; @@ -28,7 +29,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockCorporeaInterceptor extends BlockCorporeaBase { +public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { IIcon[] icons; @@ -75,4 +76,9 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase { return new TileCorporeaInterceptor(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.corporeaInterceptor; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index f721c1108..b2738ec98 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -234,6 +234,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeMasterCorporeaSpark; public static IRecipe recipeCorporeaIndex; public static IRecipe recipeCorporeaFunnel; + public static IRecipe recipeCorporeaInterceptor; public static IRecipe recipeEndStoneBricks; public static IRecipe recipeEndStoneChiseledBricks; public static IRecipe recipeLivingwoodBow; @@ -1559,6 +1560,10 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaFunnel), new ItemStack(Blocks.dropper), new ItemStack(ModItems.corporeaSpark)); recipeCorporeaFunnel = BotaniaAPI.getLatestAddedRecipe(); + // Corporea Funnel Recipe + addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaInterceptor), new ItemStack(Blocks.redstone_block), new ItemStack(ModItems.corporeaSpark)); + recipeCorporeaInterceptor = BotaniaAPI.getLatestAddedRecipe(); + // End Stone Brick Recipes GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4), "SS", "SS", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 40da296b2..476f8e5d8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -189,6 +189,7 @@ public final class LexiconData { public static LexiconEntry corporea; public static LexiconEntry corporeaIndex; public static LexiconEntry corporeaFunnel; + public static LexiconEntry corporeaInterceptor; public static LexiconEntry endStoneDecor; public static LexiconEntry spawnerMover; public static LexiconEntry keepIvy; @@ -716,6 +717,9 @@ public final class LexiconData { corporeaFunnel = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_FUNNEL, categoryEnder); corporeaFunnel.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaFunnel)); + corporeaInterceptor = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_INTERCEPTOR, categoryEnder); + corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor)); + endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder); endStoneDecor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 295dcae14..085dfc0cf 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -161,6 +161,7 @@ public final class LibLexicon { public static final String ENDER_CORPOREA = "corporea"; public static final String ENDER_CORPOREA_INDEX = "corporeaIndex"; public static final String ENDER_CORPOREA_FUNNEL = "corporeaFunnel"; + public static final String ENDER_CORPOREA_INTERCEPTOR = "corporeaInterceptor"; public static final String ENDER_END_STONE_DECOR = "endStoneDecor"; public static final String ENDER_SPAWNER_MOVER = "spawnerMover"; public static final String ENDER_KEEP_IVY = "keepIvy"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a3790c4a1..1a69f54ef 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2308,6 +2308,12 @@ botania.page.corporeaFunnel0=A simpler block that utilizes the prospects of the botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random. botania.page.corporeaFunnel2=Energistically applied +# -- CORPOREA INTERCEPTOR +botania.entry.corporeaInterceptor=Corporea Interceptor +botania.page.corporeaInterceptor0=The &1Corporea Interceptor&0 does exactly as the name suggests, it intercepts corporea requests. First and foremost, &1Item Frames&0 with items need be attached around the block, these define what items will trigger the interceptor.
Whenever a request is fired to the corporea network, be it from an Index, Funnel, etc, and there's no items in the network that can fulfil it this block will be triggered. +botania.page.corporeaInterceptor1=Of course, the the block is only triggered if the item requested matches one of items in the &1Item Frames&0 about it. When the block is triggered it'll emit a short redstone pulse. This can be used to do all sorts of things, such as craft the required item using &1Crafty Crates&0 or light up a lamp indicating that the inventory for a resource is out. +botania.page.corporeaInterceptor2=So many automation prospects + # -- DECORATIVE END BLOCKS botania.entry.endStoneDecor=Decorative End Blocks botania.page.endStoneDecor0=Similarly to other stone blocks, &1End Stone&0 can be converted into bricks and chiseled bricks, the bricks can be used as stairs or slabs just like normal &1Stone Bricks&0 would.