upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 16:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Dreamwood Twigs, used to craft Elementium Tools instead of Livingwood Twigs.

Browse Source
This commit is contained in:
Lizbeth Rika committed 2015-01-23 22:52:40 +00:00
1 parent 4b03facd89
commit e289216a53
13 files changed
+47 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
+12 -5
View File
@@ -213,6 +213,7 @@ public final class ModCraftingRecipes {
public static List<IRecipe> 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",
src/main/java/vazkii/botania/common/item/ModItems.java
+1
View File
@@ -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));
src/main/java/vazkii/botania/common/item/material/ItemManaResource.java
+1 -1
View File
@@ -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() {
src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+1 -1
View File
@@ -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"));
src/main/java/vazkii/botania/common/lib/LibItemNames.java
+2 -1
View File
@@ -146,6 +146,7 @@ public final class LibItemNames {
"dragonstone",
"prismarineShard",
"placeholder",
"redString"
"redString",
"dreamwoodTwig"
};
}
src/main/java/vazkii/botania/common/lib/LibOreDict.java
+28 -15
View File
@@ -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" };
}