diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index be8bcf93b..296d22f07 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -16,18 +16,23 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCorporeaCrystalCube extends BlockCorporeaBase { +public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaCrystalCube() { super(Material.iron, LibBlockNames.CORPOREA_CRYSTAL_CUBE); setHardness(5.5F); - setStepSound(soundTypeMetal); + setStepSound(soundTypeMetal); + float f = (1F - 10F / 16F) / 2F; + setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); } @Override @@ -41,6 +46,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { ItemStack stack = player.getCurrentEquippedItem(); + if(stack != null) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) world.getTileEntity(x, y, z); cube.setRequestTarget(stack); @@ -79,4 +85,9 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase { return new TileCorporeaCrystalCube(); } + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.corporeaCrystalCube; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ff997224b..d24aa4363 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -255,6 +255,7 @@ public final class ModCraftingRecipes { public static List recipe18StoneChisel; public static IRecipe recipeBlazeBlock; public static List recipesAltarMeta; + public static IRecipe recipeCorporeaCrystalCube; public static void init() { // Lexicon Recipe @@ -1694,6 +1695,14 @@ public final class ModCraftingRecipes { 'A', new ItemStack(ModBlocks.altar)); recipesAltarMeta = BotaniaAPI.getLatestAddedRecipes(8); + // Corporea Crystal Cube Recipe + addOreDictRecipe(new ItemStack(ModBlocks.corporeaCrystalCube), + "C", "G", "W", + 'C', new ItemStack(ModItems.corporeaSpark), + 'G', new ItemStack(ModBlocks.elfGlass), + 'W', LibOreDict.DREAM_WOOD); + recipeCorporeaCrystalCube = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index beacea6cd..c051683a6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -196,6 +196,7 @@ public final class LexiconData { public static LexiconEntry spawnerMover; public static LexiconEntry keepIvy; public static LexiconEntry blackHoleTalisman; + public static LexiconEntry corporeaCrystalCube; public static LexiconEntry baublesIntro; public static LexiconEntry cosmeticBaubles; @@ -740,6 +741,9 @@ public final class LexiconData { blackHoleTalisman = new ALexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); blackHoleTalisman.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBlackHoleTalisman)); + corporeaCrystalCube = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_CRYSTAL_CUBE, categoryEnder); + corporeaCrystalCube.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaCrystalCube)); + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index ae7ebb7d1..f89f40a7a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -168,6 +168,7 @@ public final class LibLexicon { public static final String ENDER_SPAWNER_MOVER = "spawnerMover"; public static final String ENDER_KEEP_IVY = "keepIvy"; public static final String ENDER_BLACK_HOLE_TALISMAN = "blackHoleTalisman"; + public static final String ENDER_CORPOREA_CRYSTAL_CUBE = "corporeaCrystalCube"; public static final String BAUBLE_INTRO = "bIntro"; public static final String BAUBLE_COSMETIC = "cosmeticBaubles"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 751b53d7b..1795e7df8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2348,6 +2348,12 @@ botania.page.corporeaInterceptor0=The &1Corporea Interceptor&0 does exactly as t 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 +# -- CORPOREA CRYSTAL CUBE +botania.entry.corporeaCrystalCube=Corporea Crystal Cube +botania.page.corporeaCrystalCube0=A seer usually looks through a crystal ball to see the future. Well, a corporea handler would look through a crystal cube to see the present. The &1Corporea Crystal Cube&0 acts as a visual medium to interact ith one's &4Corporea Network&0. Placing the block down and giving it a &1Corporea Spark&0 is the obvious first step to hooking it up to the network. +botania.page.corporeaCrystalCube1=When the block is connected, right clicking it with any sort of item will have it monitor that item, allowing someone who's looking at it see how many exist in the network. The display updates about once every second.
While there's an item selected, left clicking the block will request one of that item from the network. Shift-left clicking requests a whole stack. +botania.page.corporeaCrystalCube2=I can see forever + # -- 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.