diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index 17f3b3143..933e32e73 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -55,6 +55,7 @@ public final class LibResources { public static final String ENTRY_GAIA_RITUAL = PREFIX_ENTRIES + "gaiaRitual.png"; public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishingReturns.png"; public static final String ENTRY_HYDROANGEAS = PREFIX_ENTRIES + "hydroangeas.png"; + public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craftCrate.png"; public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; public static final String MODEL_ALTAR_MOSSY = PREFIX_MODEL + "altarMossy.png"; diff --git a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java index 5f4d46f19..70cc755e7 100644 --- a/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java +++ b/MODSRC/vazkii/botania/common/block/BlockOpenCrate.java @@ -92,7 +92,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return LexiconData.openCrate; + return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.openCrate : LexiconData.craftCrate; } @Override diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 9f51950d2..0d9f3b112 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -169,7 +169,9 @@ public final class ModCrafingRecipes { public static IRecipe recipeReachRing; public static IRecipe recipeSkyDirtRod; public static IRecipe recipeSpawnerClaw; - + public static IRecipe recipeCraftCrate; + public static IRecipe recipePlaceholder; + public static void init() { // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); @@ -1038,6 +1040,17 @@ public final class ModCrafingRecipes { 'M', new ItemStack(ModBlocks.storage)); recipeSpawnerClaw = BotaniaAPI.getLatestAddedRecipe(); + // Crafty Crate Recipe + GameRegistry.addRecipe(new ItemStack(ModBlocks.openCrate, 1, 1), + "WCW", "W W", "W W", + 'C', new ItemStack(Blocks.crafting_table), + 'W', new ItemStack(ModBlocks.dreamwood, 1, 1)); + recipeCraftCrate = BotaniaAPI.getLatestAddedRecipe(); + + // Crafting Placeholder Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), new ItemStack(Blocks.crafting_table), LibOreDict.LIVING_ROCK); + recipePlaceholder = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 3ec008ad7..54da9685e 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -116,6 +116,7 @@ public final class LexiconData { public static LexiconEntry spectralPlatform; public static LexiconEntry gatherDrum; public static LexiconEntry spawnerClaw; + public static LexiconEntry craftCrate; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -407,6 +408,9 @@ public final class LexiconData { spawnerClaw = new ALexiconEntry(LibLexicon.DEVICE_SPAWNER_CLAW, categoryDevices); spawnerClaw.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeSpawnerClaw)); + craftCrate = new ALexiconEntry(LibLexicon.DEVICE_CRAFT_CRATE, categoryDevices); + craftCrate.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipePlaceholder), new PageText("3"), new PageText("4"), new PageImage("5", LibResources.ENTRY_CRAFT_CRATE), new PageCraftingRecipe("6", ModCrafingRecipes.recipeCraftCrate)); + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeManaBlaster)); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 357ae1284..e3eb94162 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -93,6 +93,7 @@ public final class LibLexicon { public static final String DEVICE_SPECTRAL_PLATFORM = "spectralPlatform"; public static final String DEVICE_GATHER_DRUM = "gatherDrum"; public static final String DEVICE_SPAWNER_CLAW = "spawnerClaw"; + public static final String DEVICE_CRAFT_CRATE = "craftCrate"; public static final String TOOL_MANA_BLASTER = "manaBlaster"; public static final String TOOL_GRASS_SEEDS = "grassSeeds"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 7795556e9..4a505a9a7 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -1098,6 +1098,16 @@ botania.page.spawnerClaw0=&1Monster Spawners&0 are an interesting bunch. They ha botania.page.spawnerClaw1=By placing a &1Life Imbuer&0 on top of a &1Monster Spreader&0 and giving it a rather decent chunk of &4Mana&0 through a &1Mana Spreader&0, when there aren't any players in the nearby vicinity, the &4Mana&0 will power the spawner, just as if there were players around. botania.page.spawnerClaw2=Something something shadow dragon +# -- CRAFTY CRATE +botania.entry.craftCrate=Crafty Crate +botania.page.craftCrate0=As the name suggests, the &1Crafty Crate&0 is a counterpart to the &1Open Crate&0 with the ability to assemble items into other items similarly to a &1Crafting Table&0.
Like a &1Crafting Table&0, it has a 9 slot inventory, which can be filled with items in the pattern of a recipe. +botania.page.craftCrate1=The items go in from left to right and top to bottom (illustration further in this entry), to that, there's a special item, named the &1Crafting Placeholder&0, which, when placed in, counts as an empty slot in the recipe. This is used to allow for recipes with gaps (eg, furnace, chest, pickaxe...) to also be doable. +botania.page.craftCrate2=Creating the placeholder +botania.page.craftCrate3=To finish the recipe, one of two things can be done.
First off, filling every of the 9 slots with either recipe components or placeholders will instantly eject the result, the placeholders and any lefovers (e.g. buckets when making cake), this is the most straightforward method. +botania.page.craftCrate4=Right clicking the crate with a &1Wand of the Forest&0 (remember: &1Dispensers&0 can do this) will atempt at crafting with whatever is inside the crate and eject it.
If this fails all the items inside are simply ejected with no crafting procedure done. +botania.page.craftCrate5=An example of crafting a &1Diamond Pickaxe&0 +botania.page.craftCrate6=Made in Portugal + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster diff --git a/resources/assets/botania/textures/gui/entries/craftCrate.png b/resources/assets/botania/textures/gui/entries/craftCrate.png new file mode 100644 index 000000000..ecec6e8cf Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/craftCrate.png differ