diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 17546e06e..6f125fab0 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -32,6 +32,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibOreDict; import cpw.mods.fml.common.registry.GameRegistry; @@ -236,7 +237,8 @@ public final class ModCraftingRecipes { public static IRecipe recipeEndStoneChiseledBricks; public static IRecipe recipeLivingwoodBow; public static IRecipe recipeCrystalBow; - + public static List recipesCosmeticItems; + public static void init() { // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); @@ -1559,6 +1561,15 @@ public final class ModCraftingRecipes { 'S', LibOreDict.MANA_STRING); recipeCrystalBow = BotaniaAPI.getLatestAddedRecipe(); + // Cosmetic Items Recipes + recipesCosmeticItems = new ArrayList(); + for(int i = 0; i < 32; i++) + addOreDictRecipe(new ItemStack(ModItems.cosmetic, 1, i), + "PPP", "PSP", "PPP", + 'P', new ItemStack(i < 16 ? ModItems.petal : ModItems.manaPetal, 1, i % 16), + 'S', LibOreDict.MANA_STRING); + recipesCosmeticItems = BotaniaAPI.getLatestAddedRecipes(32); + // 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 893ef2ed3..7350e448f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -10,6 +10,9 @@ */ package vazkii.botania.common.lexicon; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -17,6 +20,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; @@ -33,7 +37,6 @@ import vazkii.botania.common.crafting.ModManaInfusionRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageElvenRecipe; @@ -183,6 +186,7 @@ public final class LexiconData { public static LexiconEntry endStoneDecor; public static LexiconEntry baublesIntro; + public static LexiconEntry cosmeticBaubles; public static LexiconEntry tinyPlanet; public static LexiconEntry manaRing; public static LexiconEntry auraRing; @@ -691,6 +695,16 @@ public final class LexiconData { baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); + cosmeticBaubles = new BLexiconEntry(LibLexicon.BAUBLE_COSMETIC, categoryBaubles); + { + List pages = new ArrayList(); + pages.add(new PageText("0")); + pages.add(new PageText("1")); + for(int i = 0; i < 32; i++) + pages.add(new PageCraftingRecipe("" + (i + 2), ModCraftingRecipes.recipesCosmeticItems.get(i))); + cosmeticBaubles.setPriority().setLexiconPages(pages.toArray(new LexiconPage[pages.size()])); + } + tinyPlanet = new BLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTinyPlanet), new PageCraftingRecipe("2", ModCraftingRecipes.recipeTinyPlanetBlock)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 3ab5bb11f..d13676eb1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -160,6 +160,7 @@ public final class LibLexicon { public static final String ENDER_END_STONE_DECOR = "endStoneDecor"; public static final String BAUBLE_INTRO = "bIntro"; + public static final String BAUBLE_COSMETIC = "cosmeticBaubles"; public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; public static final String BAUBLE_MANA_RING = "manaRing"; public static final String BAUBLE_AURA_RING = "auraRing"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 62db99905..785998eb8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1042,7 +1042,7 @@ item.botania:cosmetic4.name=Engineer Goggles item.botania:cosmetic5.name=Eyepatch item.botania:cosmetic6.name=Wicked Eyepatch item.botania:cosmetic7.name=Red Ribbons -item.botania:cosmetic8.name=Pink Flower +item.botania:cosmetic8.name=Pink Flower Bud item.botania:cosmetic9.name=Polka-Dotted Bows item.botania:cosmetic10.name=Blue Butterfly item.botania:cosmetic11.name=Cat Ears @@ -2058,6 +2058,43 @@ botania.page.bIntro0=&4Baubles&0, also commonly referred to as &4Trinkets&0 or & botania.page.bIntro1=The &4Baubles Screen&0 botania.page.bIntro2=It's to note that, if &4Thaumcraft&0 or any other mod that uses the baubles system is installed, this inventory will be shared between the various mods. +# -- COSMETIC BAUBLES +botania.entry.cosmeticBaubles=Cosmetic Baubles +botania.page.cosmeticBaubles0=A large selection of &1Cosmetic Baubles&0 is available to change or add style to any baubles a player has equipped. These can both be worn by themselves, on the amulet slot, or crafted alongside another &4Bauble&0 in a crafting grid to change the look of the bauble to the new &4Cosmetic Override&0. Removing &4Cosmetic Overrides&0 can be done through putting the bauble back in the crafting grid. +botania.page.cosmeticBaubles1=Creating these is done through an interesting method, weaving a specific color of petal around some &1Mana Infused String&0 creates an item. The type of item created doesn't seem to have anything to do with the color.
How this works really isn't too well known, it's like the person that came up with this didn't bother to use better materials or something, who knows. +botania.page.cosmeticBaubles2=They're cool +botania.page.cosmeticBaubles3=My desires are... unconventional +botania.page.cosmeticBaubles4=How unpleasant +botania.page.cosmeticBaubles5=It's cold in Kalos +botania.page.cosmeticBaubles6=Do they reveal anything? +botania.page.cosmeticBaubles7=Shut up Alexander and the Trajan +botania.page.cosmeticBaubles8=The eye has to be hidden +botania.page.cosmeticBaubles9=Not for bean sprouts +botania.page.cosmeticBaubles10=The best color +botania.page.cosmeticBaubles11=Tilting the umbrella too much +botania.page.cosmeticBaubles12=The Neighbours' Club +botania.page.cosmeticBaubles13=Nyaa +botania.page.cosmeticBaubles14=Don't get too ahead of yourself +botania.page.cosmeticBaubles15=Evil up! +botania.page.cosmeticBaubles16=Nudistoooooooooo +botania.page.cosmeticBaubles17=(insert reference here) +botania.page.cosmeticBaubles18=Lurk moar +botania.page.cosmeticBaubles19=I need your time +botania.page.cosmeticBaubles20=So rare +botania.page.cosmeticBaubles21=Oh hey, Loki +botania.page.cosmeticBaubles22=Challenge up! +botania.page.cosmeticBaubles23=Representing! +botania.page.cosmeticBaubles24=Reminds me of a puzzle +botania.page.cosmeticBaubles25=You've met with a terrible fate, haven't you? +botania.page.cosmeticBaubles26=Thanks for the gold stranger +botania.page.cosmeticBaubles27=Woah, colors +botania.page.cosmeticBaubles28=Who the hell do you think I am? +botania.page.cosmeticBaubles29=Nothing suspicious here, nope +botania.page.cosmeticBaubles30=I can fly with these +botania.page.cosmeticBaubles31=Not actually part of spain +botania.page.cosmeticBaubles32=Now you too can believe +botania.page.cosmeticBaubles33=Get on the treadmill, angbadang + # -- TINY PLANET botania.entry.tinyPlanet=Tiny Planet botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her.
By increasing its mass with some &1Stone&0, it can also be placed in world, for the same effect.