Update to 1.9.4 - untested waiting on baubles

This commit is contained in:
Vincent Lee committed 2016-05-18 15:22:35 -05:00
1 parent a59ee11da4
commit 056f46b1f8
306 files changed
+1105 -1102

No files matched your search

@@ -381,27 +381,27 @@ public final class ModBlocks {
OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock);
// Vanilla OreDict entries
OreDictionary.registerOre("dirt", Blocks.dirt);
OreDictionary.registerOre("grass", Blocks.grass);
OreDictionary.registerOre("dirt", Blocks.DIRT);
OreDictionary.registerOre("grass", Blocks.GRASS);
OreDictionary.registerOre("sand", Block.getBlockFromName("sand"));
OreDictionary.registerOre("gravel", Block.getBlockFromName("gravel"));
OreDictionary.registerOre("hardenedClay", new ItemStack(Blocks.hardened_clay, 1, OreDictionary.WILDCARD_VALUE));
OreDictionary.registerOre("snowLayer", Blocks.snow_layer);
OreDictionary.registerOre("mycelium", Blocks.mycelium);
OreDictionary.registerOre("podzol", new ItemStack(Blocks.dirt, 1, 2));
OreDictionary.registerOre("netherrack", Blocks.netherrack);
OreDictionary.registerOre("soulSand", Blocks.soul_sand);
OreDictionary.registerOre("ice", Blocks.ice);
OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.stone_slab, 1, 3));
OreDictionary.registerOre("chestWood", Blocks.chest);
OreDictionary.registerOre("craftingTableWood", Blocks.crafting_table);
OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(Blocks.prismarine, 1, OreDictionary.WILDCARD_VALUE));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[3], new ItemStack(Blocks.stone, 1, 1));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[2], new ItemStack(Blocks.stone, 1, 3));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[0], new ItemStack(Blocks.stone, 1, 5));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[7], new ItemStack(Blocks.stone, 1, 2));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[6], new ItemStack(Blocks.stone, 1, 4));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[4], new ItemStack(Blocks.stone, 1, 6));
OreDictionary.registerOre("hardenedClay", new ItemStack(Blocks.HARDENED_CLAY, 1, OreDictionary.WILDCARD_VALUE));
OreDictionary.registerOre("snowLayer", Blocks.SNOW_LAYER);
OreDictionary.registerOre("mycelium", Blocks.MYCELIUM);
OreDictionary.registerOre("podzol", new ItemStack(Blocks.DIRT, 1, 2));
OreDictionary.registerOre("netherrack", Blocks.NETHERRACK);
OreDictionary.registerOre("soulSand", Blocks.SOUL_SAND);
OreDictionary.registerOre("ice", Blocks.ICE);
OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.STONE_SLAB, 1, 3));
OreDictionary.registerOre("chestWood", Blocks.CHEST);
OreDictionary.registerOre("craftingTableWood", Blocks.CRAFTING_TABLE);
OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(Blocks.PRISMARINE, 1, OreDictionary.WILDCARD_VALUE));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[3], new ItemStack(Blocks.STONE, 1, 1));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[2], new ItemStack(Blocks.STONE, 1, 3));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[0], new ItemStack(Blocks.STONE, 1, 5));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[7], new ItemStack(Blocks.STONE, 1, 2));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[6], new ItemStack(Blocks.STONE, 1, 4));
OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[4], new ItemStack(Blocks.STONE, 1, 6));
BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR);
BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR);
@@ -414,10 +414,10 @@ public final class ModBlocks {
public static void addDispenserBehaviours() {
for(Item seed : BotaniaAPI.seeds.keySet())
BlockDispenser.dispenseBehaviorRegistry.putObject(seed, new BehaviourSeeds(BotaniaAPI.seeds.get(seed)));
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.twigWand, new BehaviourWand());
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart());
BlockDispenser.dispenseBehaviorRegistry.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin());
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(seed, new BehaviourSeeds(BotaniaAPI.seeds.get(seed)));
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.twigWand, new BehaviourWand());
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.poolMinecart, new BehaviourPoolMinecart());
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(Item.getItemFromBlock(ModBlocks.felPumpkin), new BehaviourFelPumpkin());
}
private static void initTileEntities() {