From 5f9bd3bb508201e01b0a6d6639abbe89a06df97c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 22 Jul 2014 17:14:03 +0100 Subject: [PATCH] Removed dirt and sand references for 1.7.10 and 1.7.2 cross-compatibility. --- MODSRC/vazkii/botania/common/block/ModBlocks.java | 4 ++-- .../common/block/subtile/functional/SubTileClayconia.java | 4 ++-- .../vazkii/botania/common/crafting/ModManaAlchemyRecipes.java | 3 ++- .../botania/common/crafting/ModManaConjurationRecipes.java | 3 ++- MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java | 3 ++- .../item/equipment/tool/elementium/ItemElementiumPick.java | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 7c957819a..5ee420fec 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -333,8 +333,8 @@ public final class ModBlocks { // Vanilla OreDict entries OreDictionary.registerOre("dirt", Blocks.dirt); OreDictionary.registerOre("grass", Blocks.grass); - OreDictionary.registerOre("sand", Blocks.sand); - OreDictionary.registerOre("gravel", Blocks.gravel); + 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); diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index cdf4b591d..574566f24 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -38,7 +38,7 @@ public class SubTileClayconia extends SubTileFunctional { if(coords != null) { supertile.getWorldObj().setBlockToAir(coords.posX, coords.posY, coords.posZ); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Blocks.sand)); + supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Block.getBlockFromName("sand"))); EntityItem item = new EntityItem(supertile.getWorldObj(), coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, new ItemStack(Items.clay_ball)); supertile.getWorldObj().spawnEntityInWorld(item); mana -= manaCost; @@ -59,7 +59,7 @@ public class SubTileClayconia extends SubTileFunctional { int y = supertile.yCoord + j; int z = supertile.zCoord + k; Block block = supertile.getWorldObj().getBlock(x, y, z); - if(block == Blocks.sand) + if(block == Block.getBlockFromName("sand")) possibleCoords.add(new ChunkCoordinates(x, y, z)); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 34b290125..eba76f2c2 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -14,6 +14,7 @@ package vazkii.botania.common.crafting; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -112,7 +113,7 @@ public final class ModManaAlchemyRecipes { redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.redstone), new ItemStack(Items.glowstone_dust), 300)); redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(Items.redstone), 300)); - sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.cobblestone), 50); + sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Blocks.cobblestone), 50); prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.quartz), 200); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index e4b61ef49..3dff621e0 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.crafting; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -36,7 +37,7 @@ public class ModManaConjurationRecipes { snowballRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Items.snowball, 2), new ItemStack(Items.snowball), 200); netherrackRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.netherrack, 2), new ItemStack(Blocks.netherrack), 200); soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.soul_sand, 2), new ItemStack(Blocks.soul_sand), 1500); - gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.gravel, 2), new ItemStack(Blocks.gravel), 720); + gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Block.getBlockFromName("gravel"), 2), new ItemStack(Block.getBlockFromName("gravel")), 720); } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java index 2e071aa3a..72d70017d 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -14,6 +14,7 @@ package vazkii.botania.common.crafting; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -58,7 +59,7 @@ public final class ModRuneRecipes { recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 3), costTier1, LibOreDict.MANA_STEEL, new ItemStack(Blocks.carpet, 1, i), new ItemStack(Items.feather), new ItemStack(Items.string))); recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 4), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", new ItemStack(Items.wheat)); - recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Blocks.sand), new ItemStack(Blocks.sand), new ItemStack(Items.slime_ball), new ItemStack(Items.melon)); + recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Items.slime_ball), new ItemStack(Items.melon)); recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 6), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.spider_eye)); recipesWinterRune = new ArrayList(); diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index a17a3b158..6695ddfa6 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -19,8 +19,8 @@ public class ItemElementiumPick extends ItemManasteelPick { { add(Blocks.dirt); - add(Blocks.sand); - add(Blocks.gravel); + add(Block.getBlockFromName("sand")); + add(Block.getBlockFromName("gravel")); add(Blocks.cobblestone); add(Blocks.netherrack); }};