Added oredict entries for the 1.8 stone and prismarine blocks for better compatibility with Gany's Surface.

This commit is contained in:
Lizbeth Rika committed 2015-04-17 12:20:10 +01:00
1 parent 07c72c233e
commit c0df8d7605
3 files changed
+53 -36

No files matched your search

@@ -295,7 +295,12 @@ public final class ModBlocks {
OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i], new ItemStack(doubleFlower1, 1, i));
OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i));
}
OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE));
for(int i = 0; i < 16; i++)
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[i], new ItemStack(ModFluffBlocks.stone, 1, i));
// Vanilla OreDict entries
OreDictionary.registerOre("dirt", Blocks.dirt);
OreDictionary.registerOre("grass", Blocks.grass);
@@ -1653,12 +1653,12 @@ public final class ModCraftingRecipes {
for(int i = 0; i < 4; i++) {
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 8, i + 4),
"SSS", "S S", "SSS",
'S', new ItemStack(ModFluffBlocks.stone, 1, i));
'S', LibOreDict.STONE_18_VARIANTS[i]);
recipe18StonePolish.add(BotaniaAPI.getLatestAddedRecipe());
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8),
"SS", "SS",
'S', new ItemStack(ModFluffBlocks.stone, 1, i));
'S', LibOreDict.STONE_18_VARIANTS[i]);
recipe18StoneBrick.add(BotaniaAPI.getLatestAddedRecipe());
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 1, i + 12),
@@ -39,43 +39,55 @@ public final class LibOreDict {
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 PRISMARINE_BLOCK = "blockPrismarine";
public static final String[] DOUBLE_FLOWER = new String[] { "mysticFlowerWhiteDouble",
"mysticFlowerOrangeDouble", "mysticFlowerMagentaDouble",
"mysticFlowerLightBlueDouble", "mysticFlowerYellowDouble", "mysticFlowerLimeDouble",
"mysticFlowerPinkDouble", "mysticFlowerGrayDouble", "mysticFlowerLightGrayDouble",
"mysticFlowerCyanDouble", "mysticFlowerPurpleDouble", "mysticFlowerBlueDouble",
"mysticFlowerBrownDouble", "mysticFlowerGreenDouble", "mysticFlowerRedDouble",
"mysticFlowerBlackDouble" };
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[] FLOWER = new String[] {
"mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue",
"mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray",
"mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue",
"mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack"
};
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[] DOUBLE_FLOWER = new String[] {
"mysticFlowerWhiteDouble", "mysticFlowerOrangeDouble", "mysticFlowerMagentaDouble", "mysticFlowerLightBlueDouble",
"mysticFlowerYellowDouble", "mysticFlowerLimeDouble", "mysticFlowerPinkDouble", "mysticFlowerGrayDouble",
"mysticFlowerLightGrayDouble", "mysticFlowerCyanDouble", "mysticFlowerPurpleDouble", "mysticFlowerBlueDouble",
"mysticFlowerBrownDouble", "mysticFlowerGreenDouble", "mysticFlowerRedDouble", "mysticFlowerBlackDouble"
};
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[] PETAL = new String[] {
"petalWhite", "petalOrange", "petalMagenta", "petalLightBlue",
"petalYellow", "petalLime", "petalPink", "petalGray",
"petalLightGray", "petalCyan", "petalPurple", "petalBlue",
"petalBrown", "petalGreen", "petalRed", "petalBlack"
};
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[] 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[] RUNE = new String[] {
"runeWaterB", "runeFireB", "runeEarthB", "runeAirB",
"runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB",
"runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB",
"runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB"
};
public static final String[] STONE_18_VARIANTS = new String[] {
"stoneAndesite", "stoneBasalt", "stoneDiorite", "stoneGranite",
"stoneAndesitePolished", "stoneBasaltPolished", "stoneDioritePolished", "stoneGranitePolished",
"stoneAndesiteBricks", "stoneBasaltBricks", "stoneDioriteBricks", "stoneGraniteBricks",
"stoneAndesiteChiseled", "stoneBasaltChiseled", "stoneDioriteChiseled", "stoneGraniteChiseled"
};
}