diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 3cc8fa006..edd5b8e18 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -213,6 +213,7 @@ public final class ModCraftingRecipes { public static List recipesLensFlash; public static IRecipe recipePrism; public static IRecipe recipeDirtPath; + public static IRecipe recipeDreamwoodTwig; public static void init() { // Lexicon Recipe @@ -829,22 +830,22 @@ public final class ModCraftingRecipes { addOreDictRecipe(new ItemStack(ModItems.elementiumPick), "SSS", " T ", " T ", 'S', LibOreDict.ELEMENTIUM, - 'T', LibOreDict.LIVINGWOOD_TWIG); + 'T', LibOreDict.DREAMWOOD_TWIG); recipeElementiumPick = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModItems.elementiumShovel), "S", "T", "T", 'S', LibOreDict.ELEMENTIUM, - 'T', LibOreDict.LIVINGWOOD_TWIG); + 'T', LibOreDict.DREAMWOOD_TWIG); recipeElementiumShovel = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModItems.elementiumAxe), "SS", "TS", "T ", 'S', LibOreDict.ELEMENTIUM, - 'T', LibOreDict.LIVINGWOOD_TWIG); + 'T', LibOreDict.DREAMWOOD_TWIG); recipeElementiumAxe = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModItems.elementiumSword), "S", "S", "T", 'S', LibOreDict.ELEMENTIUM, - 'T', LibOreDict.LIVINGWOOD_TWIG); + 'T', LibOreDict.DREAMWOOD_TWIG); recipeElementiumSword = BotaniaAPI.getLatestAddedRecipe(); addOreDictRecipe(new ItemStack(ModItems.elementiumShears), "S ", " S", @@ -1385,7 +1386,13 @@ public final class ModCraftingRecipes { // Trodden Dirt Recipe GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.dirtPath, 4), new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.gravel)); recipeDirtPath = BotaniaAPI.getLatestAddedRecipe(); - + + // Dreamwood Twig Recipe + addOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 13), + "W", "W", + 'W', LibOreDict.DREAM_WOOD); + recipeDreamwoodTwig = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index ed921ca94..bc026210b 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -309,6 +309,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(manaResource, 1, 10)); OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(manaResource, 1, 11)); OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(manaResource, 1, 12)); + OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(manaResource, 1, 13)); OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 3776e0509..18bc73e35 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -32,7 +32,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { - final int types = 13; + final int types = 14; IIcon[] icons; public ItemManaResource() { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index dbe6cfdaa..db785b6bc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -656,7 +656,7 @@ public final class LexiconData { elvenMessage.setPriority().setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6")); elvenResources = new ALexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); - elvenResources.setPriority().setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), new PageText("2"), new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipes), new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipe), new PageText("6"), new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe), new PageText("8"), new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe)); + elvenResources.setPriority().setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), new PageText("2"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeDreamwoodTwig), new PageElvenRecipe("3", ModElvenTradeRecipes.elementiumRecipes), new PageElvenRecipe("4", ModElvenTradeRecipes.pixieDustRecipe), new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipe), new PageText("6"), new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe), new PageText("8"), new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe)); gaiaRitual = new ALexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy); gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGaiaPylon), new PageImage("2", LibResources.ENTRY_GAIA_RITUAL), new PageText("3"), new PageText("4")); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index cdfa76a7f..f82b70280 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -146,6 +146,7 @@ public final class LibItemNames { "dragonstone", "prismarineShard", "placeholder", - "redString" + "redString", + "dreamwoodTwig" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 99e23de2a..34886d24b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -32,27 +32,40 @@ public final class LibOreDict { public static final String PRISMARINE_SHARD = "shardPrismarine"; public static final String PLACEHOLDER = "bPlaceholder"; public static final String RED_STRING = "bRedString"; + public static final String DREAMWOOD_TWIG = "dreamwoodTwig"; public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; - public static final String[] FLOWER = new String[] { - "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack", - }; + public static final String[] FLOWER = new String[] { "mysticFlowerWhite", + "mysticFlowerOrange", "mysticFlowerMagenta", + "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", + "mysticFlowerPink", "mysticFlowerGray", "mysticFlowerLightGray", + "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", + "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", + "mysticFlowerBlack", }; - public static final String[] PETAL = new String[] { - "petalWhite", "petalOrange", "petalMagenta", "petalLightBlue", "petalYellow", "petalLime", "petalPink", "petalGray", "petalLightGray", "petalCyan", "petalPurple", "petalBlue", "petalBrown", "petalGreen", "petalRed", "petalBlack", - }; + public static final String[] PETAL = new String[] { "petalWhite", + "petalOrange", "petalMagenta", "petalLightBlue", "petalYellow", + "petalLime", "petalPink", "petalGray", "petalLightGray", + "petalCyan", "petalPurple", "petalBlue", "petalBrown", + "petalGreen", "petalRed", "petalBlack", }; - public static final String[] DYE = new String[] { - "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", - }; + public static final String[] DYE = new String[] { "dyeWhite", "dyeOrange", + "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", + "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", + "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", }; - public static final String[] MANA_PETAL = new String[] { - "manaPetalWhite", "manaPetalOrange", "manaPetalMagenta", "manaPetalLightBlue", "manaPetalYellow", "manaPetalLime", "manaPetalPink", "manaPetalGray", "manaPetalLightGray", "manaPetalCyan", "manaPetalPurple", "manaPetalBlue", "manaPetalBrown", "manaPetalGreen", "manaPetalRed", "manaPetalBlack", - }; + public static final String[] MANA_PETAL = new String[] { "manaPetalWhite", + "manaPetalOrange", "manaPetalMagenta", "manaPetalLightBlue", + "manaPetalYellow", "manaPetalLime", "manaPetalPink", + "manaPetalGray", "manaPetalLightGray", "manaPetalCyan", + "manaPetalPurple", "manaPetalBlue", "manaPetalBrown", + "manaPetalGreen", "manaPetalRed", "manaPetalBlack", }; - public static final String[] RUNE = new String[] { - "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", "runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB", "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" - }; + public static final String[] RUNE = new String[] { "runeWaterB", + "runeFireB", "runeEarthB", "runeAirB", "runeSpringB", + "runeSummerB", "runeAutumnB", "runeWinterB", "runeManaB", + "runeLustB", "runeGluttonyB", "runeGreedB", "runeSlothB", + "runeWrathB", "runeEnvyB", "runePrideB" }; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ae4d26eb7..b8ecdc0e7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -796,6 +796,7 @@ item.botania:unholyCloak.name=Cloak of Sin item.botania:craftingHalo.name=Assembly Halo item.botania:blackLotus0.name=Black Lotus item.botania:blackLotus1.name=Void Lotus +item.botania:dreamwoodTwig.name=Dreamwood Twig # BREW NAMES botania.brew.fallback=Fallback @@ -1783,6 +1784,7 @@ botania.entry.elfResources=The Resources of Alfheim botania.page.elfResources0=&4Alfheim&0 contains a very varied amount of exquisite resources. Sadly though, most of them are extremely scarce and hard to come by due to competition between the various clans. The elves are interested in trading some materials, such as &1Dreamwood&0, &1Elementium&0, &1Pixie Dust&0 or &1Dragonstone&0, resources native to their lands. botania.page.elfResources1=Trading for &1Dreamwood&0 botania.page.elfResources2=&1Dreamwood&0, similarly to &1Livingwood&0 can be turned into various &4Decorative Blocks&0, have a look through the &4Decorative Blocks&0 entry under &4Miscelaneous&0 for the recipes. +botania.page.elfResources10=&1Dreamwood Twigs&0 botania.page.elfResources3=Trading for &1Elementium&0 botania.page.elfResources4=Trading for &1Pixie Dust&0 botania.page.elfResources5=Trading for &1Dragonstone&0 diff --git a/src/main/resources/assets/botania/textures/items/dreamwoodTwig.png b/src/main/resources/assets/botania/textures/items/dreamwoodTwig.png new file mode 100644 index 000000000..a684906c8 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/dreamwoodTwig.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumAxe.png b/src/main/resources/assets/botania/textures/items/elementiumAxe.png index e96b38936..10fb4077b 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementiumAxe.png and b/src/main/resources/assets/botania/textures/items/elementiumAxe.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumPick.png b/src/main/resources/assets/botania/textures/items/elementiumPick.png index af7d77c00..99ed0a8bd 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementiumPick.png and b/src/main/resources/assets/botania/textures/items/elementiumPick.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumShears.png b/src/main/resources/assets/botania/textures/items/elementiumShears.png index 92480eaaa..277af9825 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementiumShears.png and b/src/main/resources/assets/botania/textures/items/elementiumShears.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumShovel.png b/src/main/resources/assets/botania/textures/items/elementiumShovel.png index 2bd479a4e..c131071b5 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementiumShovel.png and b/src/main/resources/assets/botania/textures/items/elementiumShovel.png differ diff --git a/src/main/resources/assets/botania/textures/items/elementiumSword.png b/src/main/resources/assets/botania/textures/items/elementiumSword.png index 14132069b..121beb6e8 100644 Binary files a/src/main/resources/assets/botania/textures/items/elementiumSword.png and b/src/main/resources/assets/botania/textures/items/elementiumSword.png differ