Finalized migration mechanisms

This commit is contained in:
Vincent Lee committed 2016-04-17 20:32:17 -05:00
1 parent 55262cd4e5
commit a838427df8
5 files changed
+19 -129

No files matched your search

@@ -378,12 +378,8 @@ public final class ModBlocks {
OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i));
}
OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE));
OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock);
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);
@@ -303,26 +303,8 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.dirtPath);
addBlock(ModFluffBlocks.dirtPathSlab);
addBlock(ModBlocks.prismarine);
addBlock(ModBlocks.seaLamp);
addBlock(ModFluffBlocks.prismarineStairs);
addBlock(ModFluffBlocks.prismarineSlab);
addBlock(ModFluffBlocks.prismarineWall);
addBlock(ModFluffBlocks.prismarineBrickStairs);
addBlock(ModFluffBlocks.prismarineBrickSlab);
addBlock(ModFluffBlocks.darkPrismarineStairs);
addBlock(ModFluffBlocks.darkPrismarineSlab);
addBlock(ModBlocks.blazeBlock);
addBlock(ModBlocks.reedBlock);
addBlock(ModFluffBlocks.reedStairs);
addBlock(ModFluffBlocks.reedSlab);
addBlock(ModFluffBlocks.reedWall);
addBlock(ModBlocks.thatch);
addBlock(ModFluffBlocks.thatchStairs);
addBlock(ModFluffBlocks.thatchSlab);
addBlock(ModBlocks.customBrick);
addBlock(ModFluffBlocks.netherBrickStairs);
addBlock(ModFluffBlocks.netherBrickSlab);
@@ -188,8 +188,6 @@ public final class ModCraftingRecipes {
public static IRecipe recipeSpawnerClaw;
public static IRecipe recipeCraftCrate;
public static IRecipe recipePlaceholder;
public static IRecipe recipeReedBlock;
public static IRecipe recipeThatch;
public static IRecipe recipeNetherBrick;
public static IRecipe recipeSoulBrick;
public static IRecipe recipeSnowBrick;
@@ -247,10 +245,6 @@ public final class ModCraftingRecipes {
public static IRecipe recipeCorporeaIndex;
public static IRecipe recipeCorporeaFunnel;
public static IRecipe recipeCorporeaInterceptor;
public static IRecipe recipeEndStoneBricks;
public static IRecipe recipeEndStoneChiseledBricks;
public static IRecipe recipeEnderBricks;
public static IRecipe recipePillarEnderBricks;
public static IRecipe recipeLivingwoodBow;
public static IRecipe recipeCrystalBow;
public static List<IRecipe> recipesCosmeticItems;
@@ -264,7 +258,6 @@ public final class ModCraftingRecipes {
public static List<IRecipe> recipesPetalsDouble;
public static IRecipe recipeKeepIvy;
public static IRecipe recipeBlackHoleTalisman;
public static List<IRecipe> recipe18StoneBrick;
public static List<IRecipe> recipe18StoneChisel;
public static IRecipe recipeBlazeBlock;
public static List<IRecipe> recipesAltarMeta;
@@ -1249,18 +1242,6 @@ public final class ModCraftingRecipes {
addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "craftingTableWood", LibOreDict.LIVING_ROCK);
recipePlaceholder = BotaniaAPI.getLatestAddedRecipe();
// Reed Block Recipe
GameRegistry.addRecipe(new ItemStack(ModBlocks.reedBlock),
"rrr", "rrr", "rrr",
'r', new ItemStack(Items.reeds));
recipeReedBlock = BotaniaAPI.getLatestAddedRecipe();
// Thatch Recipe
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.thatch),
"ww", "ww",
'w', "cropWheat"));
recipeThatch = BotaniaAPI.getLatestAddedRecipe();
// Nether Brick Recipe
GameRegistry.addRecipe(new ItemStack(ModBlocks.customBrick, 4, 0),
" B ", "BSB", " B ",
@@ -1682,30 +1663,6 @@ public final class ModCraftingRecipes {
addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaInterceptor), "blockRedstone", new ItemStack(ModItems.corporeaSpark));
recipeCorporeaInterceptor = BotaniaAPI.getLatestAddedRecipe();
// End Stone Brick Recipes
if(ConfigHandler.enderStuff19Enabled) {
GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4),
"SS", "SS",
'S', new ItemStack(Blocks.end_stone));
recipeEndStoneBricks = BotaniaAPI.getLatestAddedRecipe();
GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 1, 1),
"S", "S",
'S', new ItemStack(ModFluffBlocks.endStoneSlab));
recipeEndStoneChiseledBricks = BotaniaAPI.getLatestAddedRecipe();
GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4, 2),
" B ", "BPB", " B ",
'B', new ItemStack(ModBlocks.endStoneBrick),
'P', new ItemStack(Items.ender_pearl));
recipeEnderBricks = BotaniaAPI.getLatestAddedRecipe();
GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 2, 3),
"B", "B",
'B', new ItemStack(ModBlocks.endStoneBrick, 1, 2));
recipePillarEnderBricks = BotaniaAPI.getLatestAddedRecipe();
}
// Livingwood Bow Recipe
addOreDictRecipe(new ItemStack(ModItems.livingwoodBow),
" TS", "T S", " TS",
@@ -1788,19 +1745,23 @@ public final class ModCraftingRecipes {
'A', LibOreDict.ENDER_AIR_BOTTLE);
recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe();
// 1.8 Stone Recipes
recipe18StoneBrick = new ArrayList<>();
recipe18StoneChisel = new ArrayList<>();
for(int i = 0; i < 4; i++) {
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8),
"SS", "SS",
'S', LibOreDict.STONE_18_VARIANTS[i]);
recipe18StoneBrick.add(BotaniaAPI.getLatestAddedRecipe());
// 1.8 Stone Chiseling
// todo remove when Quark adds these?
if (Botania.quarkLoaded) {
recipe18StoneChisel = new ArrayList<>();
ItemStack[] quarkBlocks = {
new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 2),
new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 3),
new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 1),
new ItemStack(Block.blockRegistry.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0),
};
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12),
"SS", "SS",
'S', new ItemStack(ModFluffBlocks.stone, 1, i + 8));
recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe());
for(int i = 0; i < 4; i++) {
addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12),
"SS", "SS",
'S', quarkBlocks[i]);
recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe());
}
}
// Blaze Light Recipe
@@ -2165,20 +2126,10 @@ public final class ModCraftingRecipes {
addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab);
addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab);
addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab);
addStairsAndSlabs(Blocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab);
addStairsAndSlabs(Blocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab);
addStairsAndSlabs(Blocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab);
addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab);
addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab);
addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab);
addStairsAndSlabs(ModBlocks.reedBlock, 0, ModFluffBlocks.reedStairs, ModFluffBlocks.reedSlab);
addStairsAndSlabs(ModBlocks.thatch, 0, ModFluffBlocks.thatchStairs, ModFluffBlocks.thatchSlab);
addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 1, ModFluffBlocks.soulBrickStairs, ModFluffBlocks.soulBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab);
addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab);
addStairsAndSlabs(ModBlocks.endStoneBrick, 0, ModFluffBlocks.endStoneStairs, ModFluffBlocks.endStoneSlab);
addStairsAndSlabs(ModBlocks.endStoneBrick, 2, ModFluffBlocks.enderBrickStairs, ModFluffBlocks.enderBrickSlab);
addStairsAndSlabs(ModBlocks.shimmerrock, 0, ModFluffBlocks.shimmerrockStairs, ModFluffBlocks.shimmerrockSlab);
addStairsAndSlabs(ModBlocks.shimmerwoodPlanks, 0, ModFluffBlocks.shimmerwoodPlankStairs, ModFluffBlocks.shimmerwoodPlankSlab);
@@ -2186,17 +2137,9 @@ public final class ModCraftingRecipes {
addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0);
addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0);
addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0);
addWall(Blocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0);
addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0);
addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0);
for(int i = 0; i < 8; i++)
addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i);
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[0], ModFluffBlocks.stoneWall, 0); // Andesite
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stoneWall, 1); // Basalt
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[2], ModFluffBlocks.stoneWall, 2); // Diorite
addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[3], ModFluffBlocks.stoneWall, 3); // Granite
// Pane Recipes
addPane(ModBlocks.manaGlass, ModFluffBlocks.managlassPane);
addPane(ModBlocks.elfGlass, ModFluffBlocks.alfglassPane);
@@ -2212,27 +2155,11 @@ public final class ModCraftingRecipes {
addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]);
}
// Andesite Basalt Diorite Granite Stair/Slab
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[0], Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]);
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]);
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[2], Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]);
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[3], Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]);
// Andesite Basalt Diorite Granite Bricks Stair/Slab
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[8], ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]);
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[9], ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]);
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[10], ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]);
addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[11], ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]);
// Pavement Stairsm & Stairs
for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++)
addStairsAndSlabs(ModFluffBlocks.pavement, i, ModFluffBlocks.pavementStairs[i], ModFluffBlocks.pavementSlabs[i]);
// Misc Recipes
GameRegistry.addShapelessRecipe(new ItemStack(Items.reeds, 9, 0), new ItemStack(ModBlocks.reedBlock));
GameRegistry.addShapelessRecipe(new ItemStack(Items.wheat, 4, 0), new ItemStack(ModBlocks.thatch));
if(Botania.gardenOfGlassLoaded)
@@ -34,8 +34,8 @@ public final class ModMigrationRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_slab")), new ItemStack(ModFluffBlocks.prismarineSlab));
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_stairs")), new ItemStack(ModFluffBlocks.prismarineBrickStairs));
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_slab")), new ItemStack(ModFluffBlocks.prismarineBrickSlab));
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs));
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab));
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs));
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab));
}
// End stuff -> vanilla
@@ -1112,15 +1112,6 @@ public final class LexiconData {
corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"),
new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor));
if (ConfigHandler.enderStuff19Enabled) {
endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder);
endStoneDecor.setLexiconPages(new PageText("0"),
new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks),
new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks),
new PageCraftingRecipe("3", ModCraftingRecipes.recipeEnderBricks),
new PageCraftingRecipe("4", ModCraftingRecipes.recipePillarEnderBricks));
}
spawnerMover = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder);
spawnerMover.setLexiconPages(new PageText("0"),
new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover));
@@ -1354,8 +1345,6 @@ public final class LexiconData {
new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz),
new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz),
new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"),
new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock),
new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch),
new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile),
new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick),
new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick),
@@ -1376,8 +1365,6 @@ public final class LexiconData {
new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz),
new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz),
new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"),
new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock),
new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch),
new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile),
new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick),
new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick),
@@ -1428,9 +1415,7 @@ public final class LexiconData {
if (ConfigHandler.stones18Enabled) {
stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc);
stoneAlchemy.setLexiconPages(new PageText("0"),
new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes),
new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StoneBrick),
new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneChisel));
new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes));
}
blazeBlock = new BLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc);