Update to 1.9.4 - untested waiting on baubles

2026-10-26 14:24:22 +00:00 · 2016-05-18 15:22:35 -05:00
1 parent a59ee11da4
commit 056f46b1f8
@@ -43,7 +43,7 @@ minecraft {
    version = "${config.mc_version}-${config.forge_version}"
    runDir = "eclipse/assets"

-    mappings = "snapshot_20160402"
+    mappings = "snapshot_20160518"
    //This, does the token replacement.
    //Though, I reccomend this to be replaced with a token such as @VERSION@
    replace 'GRADLE:BUILD', config.build_number
@@ -64,11 +64,7 @@ dependencies {
    compile files(
        'Baubles-deobf.jar'
    )
-    //compile "codechicken:CodeChickenLib:1.8-1.1.2.139:dev"
-    //compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev"
-    //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
-    //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev"
-    deobfCompile "mezz.jei:jei_1.9:3.3.3.197"
+    deobfCompile "mezz.jei:jei_1.9.4:3.4.0.202"

    //and a bit more for SCP
    sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29"
@@ -3,7 +3,7 @@
 version=r1.8
 dir_output=../Build Output/Botania/
 dir_repo=./
-mc_version=1.9
-forge_version=12.16.1.1901
+mc_version=1.9.4
+forge_version=12.16.1.1909-1.9.4
 build_number=306
 mod_name=Botania
@@ -102,16 +102,16 @@ public final class BotaniaAPI {
 	public static final Set<Class<? extends Entity>> gravityRodBlacklist = new LinkedHashSet<>();


-	public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron);
+	public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON);
 	public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20);

-	public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron);
+	public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON);
 	public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20);

-	public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_diamond);
+	public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND);
 	public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26);

-	public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_leather);
+	public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER);

 	public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic");

@@ -211,12 +211,12 @@ public final class BotaniaAPI {
 		addOreWeightNether("oreOnyx", 500); // SimpleOres 2
 		addOreWeightNether("oreHaditeCoal", 500); // Hadite

-		addSeed(Items.wheat_seeds, Blocks.wheat);
-		addSeed(Items.potato, Blocks.potatoes);
-		addSeed(Items.carrot, Blocks.carrots);
-		addSeed(Items.nether_wart, Blocks.nether_wart);
-		addSeed(Items.pumpkin_seeds, Blocks.pumpkin_stem);
-		addSeed(Items.melon_seeds, Blocks.melon_stem);
+		addSeed(Items.WHEAT_SEEDS, Blocks.WHEAT);
+		addSeed(Items.POTATO, Blocks.POTATOES);
+		addSeed(Items.CARROT, Blocks.CARROTS);
+		addSeed(Items.NETHER_WART, Blocks.NETHER_WART);
+		addSeed(Items.PUMPKIN_SEEDS, Blocks.PUMPKIN_STEM);
+		addSeed(Items.MELON_SEEDS, Blocks.MELON_STEM);

 		registerModWiki("Minecraft", new SimpleWikiProvider("Minecraft Wiki", "http://minecraft.gamepedia.com/%s"));

@@ -246,11 +246,11 @@ public final class BotaniaAPI {
 		registerModWiki("GanysNether", new SimpleWikiProvider("Gany's Nether Wiki", "http://ganys-nether.wikia.com/wiki/%s"));
 		registerModWiki("GanysEnd", new SimpleWikiProvider("Gany's End Wiki", "http://ganys-end.wikia.com/wiki/%s"));

-		registerPaintableBlock(Blocks.stained_glass, BlockStainedGlass.COLOR);
-		registerPaintableBlock(Blocks.stained_glass_pane, BlockStainedGlassPane.COLOR);
-		registerPaintableBlock(Blocks.stained_hardened_clay, BlockColored.COLOR);
-		registerPaintableBlock(Blocks.wool, BlockColored.COLOR);
-		registerPaintableBlock(Blocks.carpet, BlockCarpet.COLOR);
+		registerPaintableBlock(Blocks.STAINED_GLASS, BlockStainedGlass.COLOR);
+		registerPaintableBlock(Blocks.STAINED_GLASS_PANE, BlockStainedGlassPane.COLOR);
+		registerPaintableBlock(Blocks.STAINED_HARDENED_CLAY, BlockColored.COLOR);
+		registerPaintableBlock(Blocks.WOOL, BlockColored.COLOR);
+		registerPaintableBlock(Blocks.CARPET, BlockCarpet.COLOR);
 		
 		registerDisposableBlock("dirt"); // Vanilla
 		registerDisposableBlock("sand"); // Vanilla
@@ -122,7 +122,7 @@ public class DummyMethodHandler implements IInternalMethodHandler {

 	@Override
 	public ItemStack getSubTileAsStack(String subTile) {
-		return new ItemStack(Blocks.stone, 0, 0);
+		return new ItemStack(Blocks.STONE, 0, 0);
 	}

 	@Override
@@ -162,7 +162,7 @@ public class DummyMethodHandler implements IInternalMethodHandler {

 	@Override
 	public ItemStack getBindDisplayForFlowerType(SubTileEntity e) {
-		return new ItemStack(Blocks.stone, 0, 0);
+		return new ItemStack(Blocks.STONE, 0, 0);
 	}

 	@Override
@@ -13,20 +13,18 @@ package vazkii.botania.api.internal;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
-import net.minecraft.server.management.PlayerManager;
+import net.minecraft.server.management.PlayerChunkMapEntry;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;

-import java.util.List;
-
 public final class VanillaPacketDispatcher {

 	public static void dispatchTEToNearbyPlayers(TileEntity tile) {
 		if(tile.getWorld() instanceof WorldServer) {
 			WorldServer ws = ((WorldServer) tile.getWorld());
-			PlayerManager.PlayerInstance chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4);
+			PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4);

 			if(chunk == null)
 				return;
@@ -36,7 +34,7 @@ public final class VanillaPacketDispatcher {

 				if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64
 						&& chunk.containsPlayer(playerMP)) {
-					playerMP.playerNetServerHandler.sendPacket(tile.getDescriptionPacket());
+					playerMP.connection.sendPacket(tile.getUpdatePacket());
 				}
 			}

@@ -11,7 +11,7 @@
 package vazkii.botania.api.item;
 import net.minecraft.world.World;
 /**
- * A BiomeGenBase that implements this will not have Botania flowers generated.
+ * A Biome that implements this will not have Botania flowers generated.
 */
 public interface IFlowerlessBiome {
 	/**
@@ -106,7 +106,7 @@ public class RecipeBrew {

 	public ItemStack getOutput(ItemStack stack) {
 		if(stack == null || !(stack.getItem() instanceof IBrewContainer))
-			return new ItemStack(Items.glass_bottle); // Fallback...
+			return new ItemStack(Items.GLASS_BOTTLE); // Fallback...
 		IBrewContainer container = (IBrewContainer) stack.getItem();

 		return container.getItemForBrew(brew, stack);
@@ -55,7 +55,7 @@ public final class BotaniaSoundEvents {
    public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2");

    private static SoundEvent getRegisteredSoundEvent(String name) {
-        return SoundEvent.soundEventRegistry.getObject(new ResourceLocation(name));
+        return SoundEvent.REGISTRY.getObject(new ResourceLocation(name));
    }

    private BotaniaSoundEvents() {}
@@ -102,9 +102,9 @@ public class SubTileGenerating extends SubTileEntity {

 			if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) {
 				IBlockState state = supertile.getWorld().getBlockState(supertile.getPos());
-				supertile.getWorld().playAuxSFX(2001, supertile.getPos(), Block.getStateId(state));
+				supertile.getWorld().playEvent(2001, supertile.getPos(), Block.getStateId(state));
 				if(supertile.getWorld().getBlockState(supertile.getPos().down()).isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.UP))
-					supertile.getWorld().setBlockState(supertile.getPos(), Blocks.deadbush.getDefaultState());
+					supertile.getWorld().setBlockState(supertile.getPos(), Blocks.DEADBUSH.getDefaultState());
 				else supertile.getWorld().setBlockToAir(supertile.getPos());
 			}
 		}
@@ -23,7 +23,7 @@ public class WikiHooks {
 	private static final Map<String, IWikiProvider> modWikis = new HashMap<>();

 	public static IWikiProvider getWikiFor(Block block) {
-		ResourceLocation mod = Block.blockRegistry.getNameForObject(block);
+		ResourceLocation mod = Block.REGISTRY.getNameForObject(block);
 		return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase());
 	}

@@ -34,26 +34,26 @@ public final class ModChallenges {
 			challenges.put(level, new ArrayList<>());

 		addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.flower, 1, 6));
-		addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.record_13));
-		addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Items.reeds));
-		addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.cobblestone));
+		addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.RECORD_13));
+		addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Items.REEDS));
+		addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE));
 		addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
 		addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.pool));

 		addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.altar));
-		addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.sapling));
-		addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.wheat_seeds));
-		addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.leather));
-		addChallenge(EnumChallengeLevel.NORMAL, "boneMealFarm", new ItemStack(Items.dye, 1, 15));
+		addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.SAPLING));
+		addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.WHEAT_SEEDS));
+		addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.LEATHER));
+		addChallenge(EnumChallengeLevel.NORMAL, "boneMealFarm", new ItemStack(Items.DYE, 1, 15));
 		addChallenge(EnumChallengeLevel.NORMAL, "orechid", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID));

-		addChallenge(EnumChallengeLevel.HARD, "mobTower", new ItemStack(Items.bone));
+		addChallenge(EnumChallengeLevel.HARD, "mobTower", new ItemStack(Items.BONE));
 		addChallenge(EnumChallengeLevel.HARD, "entropinnyumSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM));
 		addChallenge(EnumChallengeLevel.HARD, "spectrolusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS));
 		addChallenge(EnumChallengeLevel.HARD, "potionBrewer", new ItemStack(ModBlocks.brewery));

 		addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS));
-		addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.diamond_pickaxe));
+		addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.DIAMOND_PICKAXE));
 		addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.rune));
 	}

@@ -37,7 +37,7 @@ public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {

 	@Override
 	public void doRenderLayer(EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) {
-		if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.invisibility) != null)
+		if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null)
 			return;

 		InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player);
@@ -106,7 +106,7 @@ public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {
 			ItemStack stack = player.inventory.getStackInSlot(i);
 			if(stack != null && stack.getItem() == ModItems.manaTablet) {
 				GlStateManager.pushMatrix();
-				Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+				Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 				Helper.rotateIfSneaking(player);
 				boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS) != null;
 				GlStateManager.rotate(90, 0, 1, 0);
@@ -34,7 +34,7 @@ public final class ColorHandler {
        Map<RegistryDelegate<Block>, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap");

        // Steal vine colorer
-        blocks.registerBlockColorHandler(map.get(Blocks.vine.delegate), ModBlocks.solidVines);
+        blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines);

        // 16 colors
        blocks.registerBlockColorHandler(
@@ -111,7 +111,7 @@ public final class ContributorFancinessHandler implements LayerRenderer<EntityPl
 		float f2 = icon.getMinV();
 		float f3 = icon.getMaxV();
 		Helper.translateToHeadLevel(player);
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.rotate(90F, 0F, 1F, 0F);
 		GlStateManager.translate(0, 1.62, 0);
@@ -145,7 +145,7 @@ public final class ContributorFancinessHandler implements LayerRenderer<EntityPl
 		GlStateManager.rotate(90F, 0F, 1F, 0F);
 		GlStateManager.rotate(180F, 1F, 0F, 0F);
 		GlStateManager.translate(-0.4F, 0.1F, -0.25F);
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		GlStateManager.rotate(90F, 0F, 1F, 0F);
 		GlStateManager.scale(0.4F, 0.4F, 0.4F);
 		GlStateManager.translate(-1F, -3.5F, 0.125F);
@@ -166,7 +166,7 @@ public final class ContributorFancinessHandler implements LayerRenderer<EntityPl
 		GlStateManager.rotate(90F, 0F, 1F, 0F);
 		GlStateManager.scale(0.4F, 0.4F, 0.4F);
 		GlStateManager.translate(-0.5F, 1.6F, 0F);
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
 		GlStateManager.popMatrix();
 	}
@@ -175,7 +175,7 @@ public final class ContributorFancinessHandler implements LayerRenderer<EntityPl
 	private static void renderFlower(EntityPlayer player, ItemStack flower) {
 		GlStateManager.pushMatrix();
 		Helper.translateToHeadLevel(player);
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		GlStateManager.rotate(180, 0, 0, 1);
 		GlStateManager.translate(0, -0.85, 0);
 		GlStateManager.rotate(-90, 0, 1, 0);
@@ -45,7 +45,7 @@ public class CorporeaAutoCompleteHandler {

 	public static void updateItemList() {
 		itemNames.clear();
-		Iterator<Item> iterator = Item.itemRegistry.iterator();
+		Iterator<Item> iterator = Item.REGISTRY.iterator();
 		ArrayList<ItemStack> curList = new ArrayList<>();

 		while(iterator.hasNext()) {
@@ -68,7 +68,7 @@ public final class DebugHandler {
 				event.getLeft().add("  GL_ARB_multitexture: " + caps.GL_ARB_multitexture);
 				event.getLeft().add("  GL_ARB_texture_non_power_of_two: " + caps.GL_ARB_texture_non_power_of_two);
 				event.getLeft().add("  OpenGL13: " + caps.OpenGL13);
-			} else if(Minecraft.isRunningOnMac)
+			} else if(Minecraft.IS_RUNNING_ON_MAC)
 				event.getLeft().add(PREFIX + "SHIFT+CMD for context");
 			else event.getLeft().add(PREFIX + "SHIFT+CTRL for context");
 		}
@@ -156,7 +156,7 @@ public class MiscellaneousIcons {
        if (!evt.getEntityPlayer().worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"))
                || !evt.getEntityPlayer().isSneaking())
            return;
-        Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+        Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

        int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH);
        int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT);
@@ -30,6 +30,7 @@ import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.client.model.obj.OBJLoader;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import vazkii.botania.api.BotaniaAPIClient;
 import vazkii.botania.api.item.IFloatingFlower;
 import vazkii.botania.api.state.BotaniaStateProps;
@@ -690,7 +691,7 @@ public final class ModelHandler {
    private static void registerMushrooms() {
        Item item = Item.getItemFromBlock(ModBlocks.mushroom);
        for (EnumDyeColor color : EnumDyeColor.values()) {
-            String name = Block.blockRegistry.getNameForObject(ModBlocks.mushroom).toString();
+            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.mushroom).toString();
            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName()));
        }
    }
@@ -698,26 +699,26 @@ public final class ModelHandler {
    private static void registerFlowers() {
        Item item = Item.getItemFromBlock(ModBlocks.flower);
        for (EnumDyeColor color : EnumDyeColor.values()) {
-            String name = Block.blockRegistry.getNameForObject(ModBlocks.flower).toString();
+            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.flower).toString();
            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName()));
        }

        item = Item.getItemFromBlock(ModBlocks.shinyFlower);
        for (EnumDyeColor color : EnumDyeColor.values()) {
-            String name = Block.blockRegistry.getNameForObject(ModBlocks.shinyFlower).toString();
+            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.shinyFlower).toString();
            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName()));
        }

        item = Item.getItemFromBlock(ModBlocks.doubleFlower1);
        for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) {
-            String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower1).toString();
+            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower1).toString();
            String variant = "inventory_" + color.getName();
            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant));
        }

        item = Item.getItemFromBlock(ModBlocks.doubleFlower2);
        for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) {
-            String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower2).toString();
+            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower2).toString();
            String variant = "inventory_" + color.getName();
            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant));
        }
@@ -725,7 +726,7 @@ public final class ModelHandler {

    private static void registerPavement() {
        Item item = Item.getItemFromBlock(ModFluffBlocks.pavement);
-        String name = Block.blockRegistry.getNameForObject(ModFluffBlocks.pavement).toString();
+        String name = ForgeRegistries.BLOCKS.getKey(ModFluffBlocks.pavement).toString();

        for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) {
            String variant = "color=" + e.getName();
@@ -875,7 +876,7 @@ public final class ModelHandler {

    private static void registerAltars() {
        Item item = Item.getItemFromBlock(ModBlocks.altar);
-        String name = Block.blockRegistry.getNameForObject(ModBlocks.altar).toString();
+        String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.altar).toString();
        for (int i = 0; i < AltarVariant.values().length - 1; i++) { // Off by one on purpose to exclude MOSSY
            String variantName = "variant=" + AltarVariant.values()[i].getName();
            ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName));
@@ -887,7 +888,7 @@ public final class ModelHandler {
            if (b == null) // Dark quartz disabled
                continue;
            Item item = Item.getItemFromBlock(b);
-            String name = Block.blockRegistry.getNameForObject(b).toString();
+            String name = ForgeRegistries.BLOCKS.getKey(b).toString();
            ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, "variant=normal"));
            ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, "variant=chiseled"));
            ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, "variant=pillar_y"));
@@ -896,7 +897,7 @@ public final class ModelHandler {

    private static void registerLuminizers() {
        Item item = Item.getItemFromBlock(ModBlocks.lightRelay);
-        String name = Block.blockRegistry.getNameForObject(ModBlocks.lightRelay).toString();
+        String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.lightRelay).toString();
        for (LuminizerVariant v : LuminizerVariant.values()) {
            ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName()));
        }
@@ -905,7 +906,7 @@ public final class ModelHandler {
    private static <T extends Enum<T> & IStringSerializable> void registerVariantsDefaulted(Block b, Class<T> enumclazz, String variantHeader) {
        Item item = Item.getItemFromBlock(b);
        for (T e : enumclazz.getEnumConstants()) {
-            String baseName = Block.blockRegistry.getNameForObject(b).toString();
+            String baseName = ForgeRegistries.BLOCKS.getKey(b).toString();
            String variantName = variantHeader + "=" + e.getName();
            ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName));
        }
@@ -915,7 +916,7 @@ public final class ModelHandler {
     * Registers all metas of the given item to models/item/registryname.json
     */
    private static void registerItemModelAllMeta(Item item, int range) {
-        String loc = Item.itemRegistry.getNameForObject(item).toString();
+        String loc = ForgeRegistries.ITEMS.getKey(item).toString();
        for(int i = 0; i < range; i++) {
            ModelLoader.registerItemVariants(item, new ModelResourceLocation(loc, "inventory"));
            ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(loc, "inventory"));
@@ -17,7 +17,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.WorldType;
-import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.Biome;
 import vazkii.botania.api.lexicon.multiblock.Multiblock;
 import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;

@@ -39,7 +39,7 @@ public class MultiblockBlockAccess implements IBlockAccess {
 			return comp.getBlockState();
 		if(hasBlockAccess)
 			return originalBlockAccess.getBlockState(pos);
-		return Blocks.air.getDefaultState();
+		return Blocks.AIR.getDefaultState();
 	}

 	@Override
@@ -80,7 +80,7 @@ public class MultiblockBlockAccess implements IBlockAccess {
 	}

 	@Override
-	public BiomeGenBase getBiomeGenForCoords(BlockPos pos) {
+	public Biome getBiomeGenForCoords(BlockPos pos) {
 		if(hasBlockAccess)
 			return originalBlockAccess.getBiomeGenForCoords(pos);
 		return null;
@@ -171,7 +171,7 @@ public final class MultiblockRenderHandler {
 		GlStateManager.enableBlend();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 		IBlockState state = comp.getBlockState();
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		if(state == null)
 			return;
 		if(IMultiblockRenderHook.renderHooks.containsKey(state.getBlock())) {
@@ -155,7 +155,7 @@ public final class TooltipAdditionDisplayHandler {

 							font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF);
 							GlStateManager.scale(0.5F, 0.5F, 1F);
-							boolean mac = Minecraft.isRunningOnMac;
+							boolean mac = Minecraft.IS_RUNNING_ON_MAC;

 							mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF);
 							GlStateManager.scale(2F, 2F, 1F);
@@ -24,10 +24,10 @@ public final class TooltipHandler {

 	@SubscribeEvent(priority = EventPriority.HIGHEST)
 	public void onTooltipEvent(ItemTooltipEvent event) {
-		if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.dirt) && event.getItemStack().getItemDamage() == 1) {
+		if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) {
 			event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt0"));
 			event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt1"));
-		} else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.mob_spawner) && event.getEntityPlayer().capabilities.isCreativeMode)
+		} else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode)
 			event.getToolTip().add(I18n.translateToLocal("botaniamisc.spawnerTip"));

 		if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false))
@@ -370,9 +370,9 @@ public class ClientProxy extends CommonProxy {
 	public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {
 		Minecraft mc = Minecraft.getMinecraft();
 		if(record == null)
-			world.playAuxSFXAtEntity(null, 1010, pos, 0);
+			world.playEvent(null, 1010, pos, 0);
 		else {
-			world.playAuxSFXAtEntity(null, 1010, pos, Item.getIdFromItem(record));
+			world.playEvent(null, 1010, pos, Item.getIdFromItem(record));
 			mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal());
 		}
 	}
@@ -11,8 +11,8 @@
 package vazkii.botania.client.fx;

 import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.particle.ParticleManager;
+import net.minecraft.client.particle.Particle;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.VertexBuffer;
@@ -32,7 +32,7 @@ import vazkii.botania.common.lib.LibObfuscation;
 import java.util.ArrayDeque;
 import java.util.Queue;

-public class FXSparkle extends EntityFX {
+public class FXSparkle extends Particle {

 	public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES);

@@ -57,7 +57,7 @@ public class FXSparkle extends EntityFX {
 		particleBlue = blue;
 		particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used
 		particleGravity = 0;
-		xSpeed = ySpeed = zSpeed = 0;
+		motionX = motionY = motionZ = 0;
 		particleScale *= size;
 		particleMaxAge = 3 * m;
 		multiplier = m;
@@ -73,7 +73,7 @@ public class FXSparkle extends EntityFX {
 		ParticleRenderDispatcher.fakeSparkleFxCount = 0;

 		GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F);
-		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles);
+		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles);

 		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 		for(FXSparkle sparkle : queuedRenders)
@@ -139,23 +139,23 @@ public class FXSparkle extends EntityFX {
 		if (particleAge++ >= particleMaxAge)
 			setExpired();

-		ySpeed -= 0.04D * particleGravity;
+		motionY -= 0.04D * particleGravity;

 		if (!noClip && !fake)
 			pushOutOfBlocks(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ);

-		posX += xSpeed;
-		posY += ySpeed;
-		posZ += zSpeed;
+		posX += motionX;
+		posY += motionY;
+		posZ += motionZ;

 		if (slowdown) {
-			xSpeed *= 0.908000001907348633D;
-			ySpeed *= 0.908000001907348633D;
-			zSpeed *= 0.908000001907348633D;
+			motionX *= 0.908000001907348633D;
+			motionY *= 0.908000001907348633D;
+			motionZ *= 0.908000001907348633D;

 			if (isCollided) {
-				xSpeed *= 0.69999998807907104D;
-				zSpeed *= 0.69999998807907104D;
+				motionX *= 0.69999998807907104D;
+				motionZ *= 0.69999998807907104D;
 			}
 		}

@@ -220,33 +220,33 @@ public class FXSparkle extends EntityFX {
 			float var26 = (rand.nextFloat() - rand.nextFloat()) * 0.1F;

 			if (var22 == 0) {
-				xSpeed = -var25;
-				ySpeed=zSpeed=var26;
+				motionX = -var25;
+				motionY=motionZ=var26;
 			}

 			if (var22 == 1) {
-				xSpeed = var25;
-				ySpeed=zSpeed=var26;
+				motionX = var25;
+				motionY=motionZ=var26;
 			}

 			if (var22 == 2) {
-				ySpeed = -var25;
-				xSpeed=zSpeed=var26;
+				motionY = -var25;
+				motionX=motionZ=var26;
 			}

 			if (var22 == 3) {
-				ySpeed = var25;
-				xSpeed=zSpeed=var26;
+				motionY = var25;
+				motionX=motionZ=var26;
 			}

 			if (var22 == 4) {
-				zSpeed = -var25;
-				ySpeed=xSpeed=var26;
+				motionZ = -var25;
+				motionY=motionX=var26;
 			}

 			if (var22 == 5) {
-				zSpeed = var25;
-				ySpeed=xSpeed=var26;
+				motionZ = var25;
+				motionY=motionX=var26;
 			}

 			return true;
@@ -11,8 +11,8 @@
 package vazkii.botania.client.fx;

 import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.particle.ParticleManager;
+import net.minecraft.client.particle.Particle;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.VertexBuffer;
@@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibObfuscation;
 import java.util.ArrayDeque;
 import java.util.Queue;

-public class FXWisp extends EntityFX {
+public class FXWisp extends Particle {

 	public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE);

@@ -52,7 +52,7 @@ public class FXWisp extends EntityFX {
 		particleBlue = blue;
 		particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used
 		particleGravity = 0;
-		xSpeed = ySpeed = zSpeed = 0;
+		motionX = motionY = motionZ = 0;
 		particleScale *= size;
 		moteParticleScale = particleScale;
 		particleMaxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul);
@@ -81,7 +81,7 @@ public class FXWisp extends EntityFX {
 		ParticleRenderDispatcher.depthIgnoringWispFxCount = 0;

 		GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F);
-		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles);
+		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles);

 		if(!queuedRenders.isEmpty()) {
 			tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
@@ -150,13 +150,13 @@ public class FXWisp extends EntityFX {
 		if (particleAge++ >= particleMaxAge)
 			setExpired();

-		ySpeed -= 0.04D * particleGravity;
-		posX += xSpeed;
-		posY += ySpeed;
-		posZ += zSpeed;
-		xSpeed *= 0.98000001907348633D;
-		ySpeed *= 0.98000001907348633D;
-		zSpeed *= 0.98000001907348633D;
+		motionY -= 0.04D * particleGravity;
+		posX += motionX;
+		posY += motionY;
+		posZ += motionZ;
+		motionX *= 0.98000001907348633D;
+		motionY *= 0.98000001907348633D;
+		motionZ *= 0.98000001907348633D;
 	}

 	public void setGravity(float value) {
@@ -164,9 +164,9 @@ public class FXWisp extends EntityFX {
 	}

 	public void setSpeed(float mx, float my, float mz) {
-		xSpeed = mx;
-		ySpeed = my;
-		zSpeed = mz;
+		motionX = mx;
+		motionY = my;
+		motionZ = mz;
 	}

 	private boolean depthTest = true;
@@ -12,13 +12,13 @@ package vazkii.botania.client.gui;

 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.achievement.GuiAchievements;
-import net.minecraft.stats.StatFileWriter;
+import net.minecraft.stats.StatisticsManager;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 import vazkii.botania.common.achievement.ModAchievements;

 public class GuiAchievementsHacky extends GuiAchievements {

-	public GuiAchievementsHacky(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_) {
+	public GuiAchievementsHacky(GuiScreen p_i45026_1_, StatisticsManager p_i45026_2_) {
 		super(p_i45026_1_, p_i45026_2_);
 		ReflectionHelper.setPrivateValue(GuiAchievements.class, this, ModAchievements.pageIndex, "currentPage");
 	}
@@ -240,7 +240,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {

 			net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
 			GlStateManager.enableRescaleNormal();
-			ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size());
+			ItemStack paper = new ItemStack(Items.PAPER, currentEntry.pages.size());

 			mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28);
 			mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, "");
@@ -35,10 +35,10 @@ public class GuiButtonDoot extends GuiButtonLexicon {
 		hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height;
 		int k = getHoverState(hovered);

-		par1Minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		par1Minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), xPosition, yPosition);
-		par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.fireworks), xPosition + 8, yPosition + 2);
+		par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.FIREWORKS), xPosition + 8, yPosition + 2);

 		GlStateManager.disableLighting();

@@ -71,7 +71,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory {

 	@Override
 	public void drawAnimations(@Nonnull Minecraft minecraft) {
-		minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex;
 		Tessellator tess = Tessellator.getInstance();
 		VertexBuffer wr = tess.getBuffer();
@@ -24,7 +24,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.WorldType;
-import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.Biome;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import vazkii.botania.api.state.BotaniaStateProps;
@@ -143,7 +143,7 @@ public class PlatformModel implements IBakedModel {
 			if(state.getBlock() instanceof BlockCamo) {
 				state = ((TileCamo) compose.getTileEntity(pos)).camoState;
 			}
-			return state == null ? Blocks.air.getDefaultState() : state;
+			return state == null ? Blocks.AIR.getDefaultState() : state;
 		}

 		@Override
@@ -152,7 +152,7 @@ public class PlatformModel implements IBakedModel {
 		}

 		@Override
-		public BiomeGenBase getBiomeGenForCoords(BlockPos pos) {
+		public Biome getBiomeGenForCoords(BlockPos pos) {
 			return compose.getBiomeGenForCoords(pos);
 		}

@@ -51,7 +51,7 @@ public class RenderBabylonWeapon extends Render<EntityBabylonWeapon> {
 		GlStateManager.enableBlend();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		GlStateManager.pushMatrix();
 		float s = 1.5F;
 		GlStateManager.scale(s, s, s);
@@ -70,7 +70,7 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {

 		Item item = stack.getItem();
 		boolean block = item instanceof ItemBlock;
-		Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.LOCATION_BLOCKS_TEXTURE : TextureMap.locationItemsTexture);
 		IIcon icon = block ? Block.getBlockFromItem(item).getBlockTextureFromSide(ForgeDirection.UP.ordinal()) : item.getIcon(stack, 0);

 		if(icon != null) {
@@ -27,7 +27,7 @@ public class RenderPoolMinecart extends RenderMinecart<EntityPoolMinecart> {
 	}

 	@Override
-	protected void func_188319_a(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) {
+	protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) {
 		RenderTilePool.forceVariant = PoolVariant.DEFAULT;
 		RenderTilePool.forceManaNumber = poolCart.getMana();
 		TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TilePool.class).renderTileEntityAt(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1);
@@ -27,7 +27,7 @@ public class RenderSnowballStack<T extends Entity> extends RenderSnowball<T> {
    }

    @Override
-    public ItemStack getPotion(T entity) {
+    public ItemStack getStackToRender(T entity) {
        return stackGetter.apply(entity);
    }

@@ -97,7 +97,7 @@ public abstract class RenderSparkBase<T extends Entity> extends Render<T> {

 	@Override
 	protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
-		return TextureMap.locationBlocksTexture;
+		return TextureMap.LOCATION_BLOCKS_TEXTURE;
 	}

 	private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) {
@@ -49,7 +49,7 @@ public class RenderThornChakram extends Render<EntityThornChakram> {

 	@Override
 	protected ResourceLocation getEntityTexture(EntityThornChakram p_110775_1_) {
-		return TextureMap.locationBlocksTexture;
+		return TextureMap.LOCATION_BLOCKS_TEXTURE;
 	}

 	private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_, int light) {
@@ -50,7 +50,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal
 		float alpha = (float) Math.min(1F, (Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 7D + 0.6D) * (Math.min(60, portal.ticksOpen) / 60F) * 0.5F;
 		GlStateManager.color(1F, 1F, 1F, alpha);

-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 		if(state == AlfPortalState.ON_X) {
 			GlStateManager.translate(1.25F, 0F, 1.75F);
@@ -94,7 +94,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
 						GlStateManager.color(1F, 1F, 1F, 1F);

 						ItemStack stack = altar.getItemHandler().getStackInSlot(i);
-						Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+						Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 						Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
 						GlStateManager.popMatrix();
 					}
@@ -104,7 +104,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
 			}


-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 			Fluid fluid = lava ? FluidRegistry.LAVA : FluidRegistry.WATER;
 			int brightness = lava ? 240 : -1;
 			float alpha = lava ? 1F : 0.7F;
@@ -70,7 +70,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
 		ItemStack stack = avatar.getItemHandler().getStackInSlot(0);
 		if(stack != null) {
 			GlStateManager.pushMatrix();
-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 			float s = 0.6F;
 			GlStateManager.scale(s, s, s);
 			GlStateManager.translate(-0.5F, 2F, -0.25F);
@@ -51,7 +51,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
 		if(stack != null) {
 			Minecraft mc = Minecraft.getMinecraft();
 			GlStateManager.pushMatrix();
-			mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 			float s = 0.25F;
 			GlStateManager.scale(s, s, s);
@@ -37,7 +37,7 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer<TileCocoon> {
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2 + 1);
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		GlStateManager.translate(0.5F, 0, 0F);
 		GlStateManager.rotate(rot, 1F, 0F, 0F);
 		GlStateManager.translate(-0.5F, 0, 0F);
@@ -53,7 +53,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
 		ItemStack stack = null;
 		if (cube != null) {
 			if(entity == null)
-                entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone));
+                entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.STONE));

 			if(itemRenderer == null)
 				itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem()) {
@@ -143,7 +143,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
 		// From FastTESR.renderTileEntityAt
 		Tessellator tessellator = Tessellator.getInstance();
 		VertexBuffer worldRenderer = tessellator.getBuffer();
-		this.bindTexture(TextureMap.locationBlocksTexture);
+		this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		RenderHelper.disableStandardItemLighting();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 		GlStateManager.enableBlend();
@@ -81,7 +81,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
 				GlStateManager.color(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
 			}

-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 			if(enchanter.stage == 3 || enchanter.stage == 4) {
 				int ticks = enchanter.stageTicks + enchanter.stage3EndTicks;
@@ -48,7 +48,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {

 		GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F);

-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 		IBlockState state = tile.getWorld().getBlockState(tile.getPos());
 		state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos());
@@ -46,7 +46,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
 		GlStateManager.translate(d0, d1, d2);
 		GlStateManager.translate(0.5F, 1.5F, 0.5F);
 		GlStateManager.rotate(ROTATIONS.get(facing), 0F, 1F, 0F);
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		float s = 0.6F;
 		GlStateManager.translate(-0.11F, -1.35F, 0F);
 		GlStateManager.scale(s, s, s);
@@ -64,7 +64,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRel
 		GlStateManager.rotate(((float) time), 0F, 0F, 1F);
 		GlStateManager.translate(0F, -off, 0F);

-		mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		ShaderHelper.useShader(ShaderHelper.halo);
 		func_77026_a(tessellator, iicon);
 		ShaderHelper.releaseShader();
@@ -61,7 +61,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {

 		boolean fab = pool == null ? forceVariant == PoolVariant.FABULOUS : pool.getWorld().getBlockState(pool.getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS;

-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 		int color = 0xFFFFFF;

 		if (fab) {
@@ -33,7 +33,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {
 		ItemStack stack = prism.getItemHandler().getStackInSlot(0);

 		if(stack != null) {
-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 			if(stack.getItem() instanceof ILens) {
 				GlStateManager.pushMatrix();
 				GlStateManager.rotate(90F, 1F, 0F, 0F);
@@ -71,7 +71,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> {

 			if(ConfigHandler.oldPylonModel)
 				Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld);
-			else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 			double worldTime = pylon.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks);

@@ -56,7 +56,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
 			ItemStack stack = altar.getItemHandler().getStackInSlot(i);
 			Minecraft mc = Minecraft.getMinecraft();
 			if(stack != null) {
-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 				mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);

@@ -30,7 +30,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkC
 		ItemStack stack = tileentity.getItemHandler().getStackInSlot(0);
 		if(stack != null) {
 			GlStateManager.pushMatrix();
-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 			float s = 0.6F;
 			GlStateManager.scale(s, s, s);
 			GlStateManager.rotate(180F, 0F, 1F, 0F);
@@ -87,7 +87,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
 		ItemStack stack = spreader.getItemHandler().getStackInSlot(0);

 		if(stack != null) {
-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 			ILens lens = (ILens) stack.getItem();
 			GlStateManager.pushMatrix();
 			GlStateManager.translate(-0.0F, -1F, -0.4375F);
@@ -97,9 +97,9 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
 		}

 		if(spreader.paddingColor != -1) {
-			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

-			IBlockState carpet = Blocks.carpet.getDefaultState().withProperty(BlockCarpet.COLOR, EnumDyeColor.byMetadata(spreader.paddingColor));
+			IBlockState carpet = Blocks.CARPET.getDefaultState().withProperty(BlockCarpet.COLOR, EnumDyeColor.byMetadata(spreader.paddingColor));

 			GlStateManager.translate(-0.5F, -0.5F, 0.5F);
 			float f = 1 / 16F;
@@ -51,7 +51,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer<TileTerraPla
 			GlStateManager.color(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
 		}

-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 		ShaderHelper.useShader(ShaderHelper.terraPlateRune);
 		renderIcon(0, 0, MiscellaneousIcons.INSTANCE.terraPlateOverlay, 1, 1, 240);
@@ -129,7 +129,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota

 		if (!name.isEmpty()) {
 			GlStateManager.pushMatrix();
-			mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+			mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);

 			ContributorFancinessHandler.firstStart();

@@ -201,17 +201,17 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
 				GlStateManager.rotate(270F, 0F, 1F, 0F);
 				GlStateManager.translate(0F, -1F, 0.4F);
-				renderItem(new ItemStack(Items.book));
+				renderItem(new ItemStack(Items.BOOK));

-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 				GlStateManager.scale(0.3F, 0.3F, 0.3F);
-				renderItem(new ItemStack(Blocks.iron_ore));
+				renderItem(new ItemStack(Blocks.IRON_ORE));
 			} else if (name.equals("profmobius")) {
 				GlStateManager.scale(1.25F, 1.25F, 1.25F);
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
 				GlStateManager.rotate(270F, 0F, 1F, 0F);
 				GlStateManager.translate(0F, -0.7F, 0.4F);
-				renderItem(new ItemStack(Items.bread));
+				renderItem(new ItemStack(Items.BREAD));
 			} else if (name.equals("martysgames") || name.equals("marty")) {
 				GlStateManager.scale(0.7F, 0.7F, 0.7F);
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
@@ -258,7 +258,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
 				GlStateManager.rotate(90F, 0F, 1F, 0F);
 				GlStateManager.translate(-0.1F, -0.6F, -0.325F);
-				renderItem(new ItemStack(Items.painting));
+				renderItem(new ItemStack(Items.PAINTING));
 			} else if (name.equals("jibril")) {
 				GlStateManager.scale(1.5F, 1.5F, 1.5F);
 				GlStateManager.translate(0F, 0.7F, 0F);
@@ -267,16 +267,16 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
 			} else if (name.equals("nebris")) {
 				GlStateManager.scale(2F, 2F, 2F);
 				GlStateManager.rotate(180F, 1F, 0F, 0F);
-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-				renderItem(new ItemStack(Blocks.glowstone));
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+				renderItem(new ItemStack(Blocks.GLOWSTONE));
 			} else if (name.equals("ible")) {
-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 				GlStateManager.scale(1.2F, 1.2F, 1.2F);
 				GlStateManager.translate(-0.5F, 0F, -0.5F);
 				GlStateManager.rotate(180F, 1F, 1F, 0F);
 				GlStateManager.enableBlend();
 				GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-				renderBlock(Blocks.portal);
+				renderBlock(Blocks.PORTAL);
 			} else if (name.equals("razz") || name.equals("razzleberryfox")) {
 				GlStateManager.scale(1.25F, 1.25F, 1.25F);
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
@@ -289,19 +289,19 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
 				GlStateManager.rotate(180F, 0F, 1F, 0F);
 				GlStateManager.rotate(90F, 0F, 1F, 0F);
 				GlStateManager.translate(0F, -0.7F, 0.4F);
-				renderItem(new ItemStack(Items.cookie));
+				renderItem(new ItemStack(Items.COOKIE));
 			} else if (name.equals("sethbling")) {
 				GlStateManager.scale(1.2F, 1.2F, 1.2F);
 				GlStateManager.translate(-0.5F, 1.4F, -0.5F);
 				GlStateManager.rotate(180F, 1F, 0F, 0F);
-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-				renderBlock(Blocks.command_block);
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+				renderBlock(Blocks.COMMAND_BLOCK);
 			} else if (name.equals("bdoubleo100") || name.equals("bdoubleo")) {
 				GlStateManager.scale(1.25F, 1.25F, 1.25F);
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
 				GlStateManager.rotate(180F, 0F, 1F, 0F);
 				GlStateManager.translate(0.5F, -0.6F, 0.1F);
-				renderItem(new ItemStack(Items.stick));
+				renderItem(new ItemStack(Items.STICK));
 			} else if (name.equals("kingdaddydmac")) {
 				GlStateManager.scale(0.5F, 0.5F, 0.5F);
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
@@ -314,8 +314,8 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota

 				GlStateManager.scale(0.8F, 0.8F, 0.8F);
 				GlStateManager.translate(-1.7F, -1.2F, -0.1F);
-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-				renderBlock(Blocks.cake);
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+				renderBlock(Blocks.CAKE);
 			} else if (name.equals("sjin")) {
 				GlStateManager.scale(1.25F, 1.25F, 1.25F);
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
@@ -327,12 +327,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
 				GlStateManager.rotate(180F, 0F, 0F, 1F);
 				GlStateManager.rotate(180F, 0F, 1F, 0F);
 				GlStateManager.translate(0F, 0.05F, 0.1F);
-				mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-				renderItem(new ItemStack(Blocks.sapling, 0, 0));
+				mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+				renderItem(new ItemStack(Blocks.SAPLING, 0, 0));
 			} else if (ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) {
 				ItemStack icon = ContributorFancinessHandler.flowerMap.get(name);
 				if (icon != null) {
-					mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+					mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 					GlStateManager.rotate(180F, 1F, 0F, 0F);
 					GlStateManager.rotate(180F, 0F, 1F, 0F);
 					GlStateManager.translate(0F, 0F, 0F);
@@ -132,7 +132,7 @@ public final class ModAchievements {

 		signalFlareStun = new AchievementMod(LibAchievementNames.SIGNAL_FLARE_STUN, -3, 1, ModItems.signalFlare, null).setSpecial();
 		l20ShardUse = new AchievementMod(LibAchievementNames.L20_SHARD_USE, -5, 3, ModItems.laputaShard, null).setSpecial();
-		gaiaGuardianNoArmor = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_NO_ARMOR, -5, 1, new ItemStack(Items.skull, 1, 3), null).setSpecial();
+		gaiaGuardianNoArmor = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_NO_ARMOR, -5, 1, new ItemStack(Items.SKULL, 1, 3), null).setSpecial();
 		rankSSPick = new AchievementMod(LibAchievementNames.RANK_SS_PICK, -3, 3, ModItems.terraPick, null).setSpecial();
 		superCorporeaRequest = new AchievementMod(LibAchievementNames.SUPER_CORPOREA_REQUEST, -3, -1, ModBlocks.corporeaIndex, null).setSpecial();
 		pinkinator = new AchievementMod(LibAchievementNames.PINKINATOR, -5, -1, ModItems.pinkinator, null).setSpecial();
@@ -34,7 +34,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable {

 	public BlockAlfPortal() {
-		super(Material.wood, LibBlockNames.ALF_PORTAL);
+		super(Material.WOOD, LibBlockNames.ALF_PORTAL);
 		setHardness(10F);
 		setSoundType(SoundType.WOOD);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF));
@@ -44,7 +44,7 @@ import java.util.Random;
 public class BlockAltGrass extends BlockMod implements ILexiconable {

 	public BlockAltGrass() {
-		super(Material.grass, LibBlockNames.ALT_GRASS);
+		super(Material.GRASS, LibBlockNames.ALT_GRASS);
 		setHardness(0.6F);
 		setSoundType(SoundType.PLANT);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY));
@@ -91,7 +91,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
 				
 				world.getBlockState(pos1.up()).getBlock();

-				if(world.getBlockState(pos1).getBlock() == Blocks.dirt && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2)
+				if(world.getBlockState(pos1).getBlock() == Blocks.DIRT && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2)
 					world.setBlockState(pos1, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2);
 			}
 		}
@@ -99,7 +99,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {

 	@Override
    public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) {
-        return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_);
+        return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_);
    }

 	@Override
@@ -60,7 +60,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
 	private final Random random = new Random();

 	protected BlockAltar() {
-		super(Material.rock, LibBlockNames.ALTAR);
+		super(Material.ROCK, LibBlockNames.ALTAR);
 		setHardness(3.5F);
 		setSoundType(SoundType.STONE);
 		setDefaultState(blockState.getBaseState()
@@ -146,7 +146,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
 				if(stackAt != null) {
 					ItemStack copy = stackAt.copy();
 					if(!par5EntityPlayer.inventory.addItemStackToInventory(copy))
-						par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false);
+						par5EntityPlayer.dropItem(copy, false);
 					tile.getItemHandler().setStackInSlot(i, null);
 					par1World.updateComparatorOutputLevel(pos, this);
 					break;
@@ -168,7 +168,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
 				}

 				return true;
-			} else if(stack != null && stack.getItem() == Items.lava_bucket) {
+			} else if(stack != null && stack.getItem() == Items.LAVA_BUCKET) {
 				if(!par5EntityPlayer.capabilities.isCreativeMode)
 					par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));

@@ -178,13 +178,13 @@ public class BlockAltar extends BlockMod implements ILexiconable {
 				par1World.checkLight(pos);

 				return true;
-			} else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) {
-				ItemStack bucket = tile.hasLava ? new ItemStack(Items.lava_bucket) : new ItemStack(Items.water_bucket);
+			} else if(stack != null && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) {
+				ItemStack bucket = tile.hasLava ? new ItemStack(Items.LAVA_BUCKET) : new ItemStack(Items.WATER_BUCKET);
 				if(stack.stackSize == 1)
 					par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket);
 				else {
 					if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket))
-						par5EntityPlayer.dropPlayerItemWithRandomChoice(bucket, false);
+						par5EntityPlayer.dropItem(bucket, false);
 					stack.stackSize--;
 				}

@@ -234,7 +234,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {

 	private ItemStack getContainer(ItemStack stack) {
 		if(stack.getItem() == ModItems.waterBowl)
-			return new ItemStack(Items.bowl);
+			return new ItemStack(Items.BOWL);

 		if (stack.getItem().hasContainerItem(stack))
 			return stack.getItem().getContainerItem(stack);
@@ -46,7 +46,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
 	private final Random random = new Random();

 	protected BlockAvatar() {
-		super(Material.wood, LibBlockNames.AVATAR);
+		super(Material.WOOD, LibBlockNames.AVATAR);
 		setHardness(2.0F);
 		setSoundType(SoundType.WOOD);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH));
@@ -85,7 +85,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
 			ItemStack copyStack = stackOnAvatar.copy();
 			avatar.getItemHandler().setStackInSlot(0, null);
 			if(!player.inventory.addItemStackToInventory(copyStack))
-				player.dropPlayerItemWithRandomChoice(copyStack, true);
+				player.dropItem(copyStack, true);
 			return true;
 		} else if(stackOnPlayer != null && stackOnPlayer.getItem() instanceof IAvatarWieldable) {
 			ItemStack copyStack = stackOnPlayer.copy();
@@ -36,7 +36,7 @@ import java.util.Random;
 public class BlockBifrost extends BlockMod implements ILexiconable {

 	public BlockBifrost() {
-		super(Material.glass, LibBlockNames.BIFROST);
+		super(Material.GLASS, LibBlockNames.BIFROST);
 		setLightOpacity(0);
 		setLightLevel(1F);
 		setBlockUnbreakable();
@@ -31,7 +31,7 @@ import java.util.Random;
 public class BlockBifrostPerm extends BlockMod implements ILexiconable {

 	public BlockBifrostPerm() {
-		super(Material.glass, LibBlockNames.BIFROST_PERM);
+		super(Material.GLASS, LibBlockNames.BIFROST_PERM);
 		setLightOpacity(0);
 		setHardness(0.3F);
 		setLightLevel(1F);
@@ -31,7 +31,7 @@ import java.util.List;
 public class BlockCacophonium extends BlockMod {

 	protected BlockCacophonium() {
-		super(Material.wood, LibBlockNames.CACOPHONIUM);
+		super(Material.WOOD, LibBlockNames.CACOPHONIUM);
 		setHardness(0.8F);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
 	}
@@ -62,7 +62,7 @@ public class BlockCacophonium extends BlockMod {
 	}

 	@Override
-	public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
 		boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0;
 		boolean powered = state.getValue(BotaniaStateProps.POWERED);

@@ -100,7 +100,7 @@ public class BlockCacophonium extends BlockMod {

 		TileEntity tile = world.getTileEntity(pos);
 		if(tile != null && tile instanceof TileCacophonium) {
-			stacks.add(new ItemStack(Blocks.noteblock));
+			stacks.add(new ItemStack(Blocks.NOTEBLOCK));
 			ItemStack thingy = ((TileCacophonium) tile).stack;
 			if(thingy != null)
 				stacks.add(thingy.copy());
@@ -53,7 +53,7 @@ public abstract class BlockCamo extends BlockMod {
 			TileCamo camo = (TileCamo) tile;
 			IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(par1World, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), par5EntityPlayer);

-			if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.air) {
+			if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.AIR) {
 				camo.camoState = changeState;
 				par1World.notifyBlockUpdate(pos, state, state, 8);

@@ -31,7 +31,7 @@ import java.util.List;
 public class BlockCell extends BlockMod implements ILexiconable {

 	public BlockCell() {
-		super(Material.gourd, LibBlockNames.CELL_BLOCK);
+		super(Material.GOURD, LibBlockNames.CELL_BLOCK);
 		setSoundType(SoundType.CLOTH);
 	}

@@ -38,7 +38,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable {
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 0.125, 0.875, 0.125);

 	protected BlockCocoon() {
-		super(Material.cloth, LibBlockNames.COCOON);
+		super(Material.CLOTH, LibBlockNames.COCOON);
 		setHardness(3.0F);
 		setResistance(50.0F);
 		setSoundType(SoundType.CLOTH);
@@ -67,11 +67,11 @@ public class BlockCocoon extends BlockMod implements ILexiconable {
 	@Override
 	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack item, EnumFacing s, float xs, float ys, float zs) {
 		TileCocoon cocoon = (TileCocoon) world.getTileEntity(pos);
-		if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.emerald) {
+		if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.EMERALD) {
 			if(!player.capabilities.isCreativeMode)
 				item.stackSize--;
 			cocoon.emeraldsGiven++;
-			world.playAuxSFX(2005, pos, 6 + world.rand.nextInt(4));
+			world.playEvent(2005, pos, 6 + world.rand.nextInt(4));
 		}
 		return false;
 	}
@@ -33,7 +33,7 @@ import java.util.Random;
 public class BlockEnchantedSoil extends BlockMod implements ILexiconable {

 	public BlockEnchantedSoil() {
-		super(Material.grass, LibBlockNames.ENCHANTED_SOIL);
+		super(Material.GRASS, LibBlockNames.ENCHANTED_SOIL);
 		setHardness(0.6F);
 		setSoundType(SoundType.PLANT);
 	}
@@ -45,7 +45,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable {

 	@Override
 	public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) {
-		return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_);
+		return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_);
 	}

 	@Override
@@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockEnderEye extends BlockMod implements ILexiconable {

 	protected BlockEnderEye() {
-		super(Material.iron, LibBlockNames.ENDER_EYE_BLOCK);
+		super(Material.IRON, LibBlockNames.ENDER_EYE_BLOCK);
 		setHardness(3F);
 		setResistance(10F);
 		setSoundType(SoundType.METAL);
@@ -35,7 +35,7 @@ public class BlockFakeAir extends BlockMod {
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0);

 	public BlockFakeAir() {
-		super(Material.air, LibBlockNames.FAKE_AIR);
+		super(Material.AIR, LibBlockNames.FAKE_AIR);
 		setTickRandomly(true);
 	}

@@ -53,7 +53,7 @@ public class BlockFakeAir extends BlockMod {
 	public void registerItemForm() {}

 	@Override
-	public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
 		if(shouldRemove(world, pos))
 			world.scheduleUpdate(pos, this, tickRate(world));
 	}
@@ -65,7 +65,7 @@ public class BlockFakeAir extends BlockMod {
 	@Override
 	public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
 		if(shouldRemove(world, pos))
-			world.setBlockState(pos, Blocks.water.getDefaultState());
+			world.setBlockState(pos, Blocks.WATER.getDefaultState());
 	}

 	@Override
@@ -38,7 +38,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
 	private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned";

 	public BlockFelPumpkin() {
-		super(Material.gourd, LibBlockNames.FEL_PUMPKIN);
+		super(Material.GOURD, LibBlockNames.FEL_PUMPKIN);
 		setHardness(1F);
 		setSoundType(SoundType.WOOD);
 		MinecraftForge.EVENT_BUS.register(this);
@@ -64,17 +64,17 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
 	public void onBlockAdded(World p_149726_1_, BlockPos pos, IBlockState state) {
 		super.onBlockAdded(p_149726_1_, pos, state);

-		if(!p_149726_1_.isRemote && p_149726_1_.getBlockState(pos.down()).getBlock() == Blocks.iron_bars && p_149726_1_.getBlockState(pos.down(2)).getBlock() == Blocks.iron_bars) {
-			p_149726_1_.setBlockState(pos, Blocks.air.getDefaultState(), 2);
-			p_149726_1_.setBlockState(pos.down(), Blocks.air.getDefaultState(), 2);
-			p_149726_1_.setBlockState(pos.down(2), Blocks.air.getDefaultState(), 2);
+		if(!p_149726_1_.isRemote && p_149726_1_.getBlockState(pos.down()).getBlock() == Blocks.IRON_BARS && p_149726_1_.getBlockState(pos.down(2)).getBlock() == Blocks.IRON_BARS) {
+			p_149726_1_.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+			p_149726_1_.setBlockState(pos.down(), Blocks.AIR.getDefaultState(), 2);
+			p_149726_1_.setBlockState(pos.down(2), Blocks.AIR.getDefaultState(), 2);
 			EntityBlaze blaze = new EntityBlaze(p_149726_1_);
 			blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F);
 			blaze.getEntityData().setBoolean(TAG_FEL_SPAWNED, true);
 			p_149726_1_.spawnEntityInWorld(blaze);
-			p_149726_1_.notifyNeighborsOfStateChange(pos, Blocks.air);
-			p_149726_1_.notifyNeighborsOfStateChange(pos.down(), Blocks.air);
-			p_149726_1_.notifyNeighborsOfStateChange(pos.down(2), Blocks.air);
+			p_149726_1_.notifyNeighborsOfStateChange(pos, Blocks.AIR);
+			p_149726_1_.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR);
+			p_149726_1_.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR);
 		}
 	}

@@ -87,11 +87,11 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
 	public void onDrops(LivingDropsEvent event) {
 		if(event.getEntityLiving() instanceof EntityBlaze && event.getEntityLiving().getEntityData().getBoolean(TAG_FEL_SPAWNED))
 			if(event.getDrops().isEmpty())
-				event.getDrops().add(new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.blaze_powder, 6)));
+				event.getDrops().add(new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.BLAZE_POWDER, 6)));
 			else for(EntityItem item : event.getDrops()) {
 				ItemStack stack = item.getEntityItem();
-				if(stack.getItem() == Items.blaze_rod)
-					item.setEntityItemStack(new ItemStack(Items.blaze_powder, stack.stackSize * 10));
+				if(stack.getItem() == Items.BLAZE_ROD)
+					item.setEntityItemStack(new ItemStack(Items.BLAZE_POWDER, stack.stackSize * 10));
 			}
 	}

@@ -179,8 +179,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
 	}

 	@Override
-	public boolean onBlockEventReceived(World par1World, BlockPos pos, IBlockState state, int eventID, int value) {
-		super.onBlockEventReceived(par1World, pos, state, eventID, value);
+	public boolean eventReceived(IBlockState state, World par1World, BlockPos pos, int eventID, int value) {
+		super.eventReceived(state, par1World, pos, eventID, value);
 		TileEntity tileentity = par1World.getTileEntity(pos);
 		return tileentity != null ? tileentity.receiveClientEvent(eventID, value) : false;
 	}
@@ -31,7 +31,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable {
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75);

 	public BlockForestEye() {
-		super(Material.iron, LibBlockNames.FOREST_EYE);
+		super(Material.IRON, LibBlockNames.FOREST_EYE);
 		setHardness(5.0F);
 		setResistance(10.0F);
 		setSoundType(SoundType.METAL);
@@ -76,7 +76,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable {
 		else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) {
 			event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 0);
 			if(floatTicks > 0)
-				event.getEntity().worldObj.playAuxSFX(2003, entPos, 0);
+				event.getEntity().worldObj.playEvent(2003, entPos, 0);
 		}
 		floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS);

@@ -90,7 +90,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable {
 			event.getEntity().motionX *= 1.4;
 			event.getEntity().motionZ *= 1.4;
 			event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1);
-			event.getEntity().worldObj.playAuxSFX(2000, entPos, 0);
+			event.getEntity().worldObj.playEvent(2000, entPos, 0);
 		} else event.getEntity().noClip = false;
 	}

@@ -52,7 +52,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
 	private final Random random = new Random();

 	protected BlockHourglass() {
-		super(Material.iron, LibBlockNames.HOURGLASS);
+		super(Material.IRON, LibBlockNames.HOURGLASS);
 		setHardness(2.0F);
 		setSoundType(SoundType.METAL);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
@@ -99,7 +99,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
 		} else if(hgStack != null) {
 			ItemStack copy = hgStack.copy();
 			if(!player.inventory.addItemStackToInventory(copy))
-				player.dropPlayerItemWithRandomChoice(copy, false);
+				player.dropItem(copy, false);
 			hourglass.getItemHandler().setStackInSlot(0, null);
 			hourglass.markDirty();
 			return true;
@@ -39,7 +39,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
 	private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.125, 0, 0.375, 0.875, 1/16.0, 0.625);

 	protected BlockIncensePlate() {
-		super(Material.wood, LibBlockNames.INCENSE_PLATE);
+		super(Material.WOOD, LibBlockNames.INCENSE_PLATE);
 		setHardness(2.0F);
 		setSoundType(SoundType.WOOD);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
@@ -77,14 +77,14 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
 			stack.stackSize--;
 			did = true;
 		} else if(plateStack != null && !plate.burning) {
-			if(stack != null && stack.getItem() == Items.flint_and_steel) {
+			if(stack != null && stack.getItem() == Items.FLINT_AND_STEEL) {
 				plate.ignite();
 				stack.damageItem(1, player);
 				did = true;
 			} else {
 				ItemStack addStack = plateStack.copy();
 				if(!player.inventory.addItemStackToInventory(addStack))
-					player.dropPlayerItemWithRandomChoice(addStack, false);
+					player.dropItem(addStack, false);
 				plate.getItemHandler().setStackInSlot(0, null);

 				did = true;
@@ -41,7 +41,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1);

 	public BlockLightLauncher() {
-		super(Material.wood, LibBlockNames.LIGHT_LAUNCHER);
+		super(Material.WOOD, LibBlockNames.LIGHT_LAUNCHER);
 		setHardness(2.0F);
 		setSoundType(SoundType.WOOD);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
@@ -83,7 +83,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
 	}

 	@Override
-	public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
 		boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0|| world.isBlockIndirectlyGettingPowered(pos.up()) > 0;
 		boolean powered = state.getValue(BotaniaStateProps.POWERED);

@@ -44,7 +44,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(5.0/16, 5.0/16, 5.0/16, 11.0/16, 11.0/16, 11.0/16);

 	protected BlockLightRelay() {
-		super(Material.glass, LibBlockNames.LIGHT_RELAY);
+		super(Material.GLASS, LibBlockNames.LIGHT_RELAY);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false));
 	}

@@ -35,7 +35,7 @@ import java.util.List;
 public class BlockLivingrock extends BlockMod implements ILexiconable {

 	public BlockLivingrock() {
-		super(Material.rock, LibBlockNames.LIVING_ROCK);
+		super(Material.ROCK, LibBlockNames.LIVING_ROCK);
 		setHardness(2.0F);
 		setResistance(10.0F);
 		setSoundType(SoundType.STONE);
@@ -40,7 +40,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
 	}

 	public BlockLivingwood(String name) {
-		super(Material.wood, name);
+		super(Material.WOOD, name);
 		setHardness(2.0F);
 		setSoundType(SoundType.WOOD);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT));
@@ -32,7 +32,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable, ICraftAchievement {

 	public BlockManaBomb() {
-		super(Material.wood, LibBlockNames.MANA_BOMB);
+		super(Material.WOOD, LibBlockNames.MANA_BOMB);
 		setHardness(12.0F);
 		setSoundType(SoundType.WOOD);
 	}
@@ -40,7 +40,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl
 	@Override
 	public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) {
 		if(!burst.isFake() && !world.isRemote) {
-			world.playAuxSFX(2001, pos, Block.getStateId(this.getDefaultState()));
+			world.playEvent(2001, pos, Block.getStateId(this.getDefaultState()));
 			world.setBlockToAir(pos);
 			EntityManaStorm storm = new EntityManaStorm(world);
 			storm.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
@@ -111,7 +111,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
 					//if (blockdoubleplant$enumplanttype != BlockDoublePlant.EnumPlantType.FERN && blockdoubleplant$enumplanttype != BlockDoublePlant.EnumPlantType.GRASS) {
 						// worldIn.destroyBlock(pos.down(), true);
 					//} else if (!world.isRemote) {
-					//	if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears) {
+					//	if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.SHEARS) {
 					//		this.onHarvest(worldIn, pos, iblockstate, player);
 					//		world.setBlockToAir(pos.down());
 					//	} else {
@@ -125,7 +125,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
 				}
 			}
 		} else if(player.capabilities.isCreativeMode && world.getBlockState(pos.up()).getBlock() == this)
-			world.setBlockState(pos.up(), Blocks.air.getDefaultState(), 2);
+			world.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2);
 		player.addStat(StatList.getBlockStats(this));
 		//super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_);
 	}
@@ -52,7 +52,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
 	Random random;

 	public BlockOpenCrate() {
-		super(Material.wood, LibBlockNames.OPEN_CRATE);
+		super(Material.WOOD, LibBlockNames.OPEN_CRATE);
 		setHardness(2.0F);
 		setSoundType(SoundType.WOOD);
 		setDefaultState(blockState.getBaseState()
@@ -67,7 +67,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 	private final TObjectIntHashMap<DimWithPos> coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1);

 	public BlockPistonRelay() {
-		super(Material.gourd, LibBlockNames.PISTON_RELAY);
+		super(Material.GOURD, LibBlockNames.PISTON_RELAY);
 		setHardness(2F);
 		setResistance(10F);
 		setSoundType(SoundType.METAL);
@@ -114,7 +114,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 	private IBlockState getStateAt(DimWithPos key) {
 		MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
 		if(server == null)
-			return Blocks.air.getDefaultState();
+			return Blocks.AIR.getDefaultState();
 		return server.worldServerForDimension(key.dim).getBlockState(key.blockPos);
 	}

@@ -129,7 +129,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 		} else {
 			spawnAsEntity(world, pos, new ItemStack(this));
 			world.setBlockToAir(pos);
-			world.playAuxSFX(2001, pos, Block.getStateId(getDefaultState()));
+			world.playEvent(2001, pos, Block.getStateId(getDefaultState()));
 		}

 		return true;
@@ -171,16 +171,17 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 		}

 		@Override
-		public void writeToNBT(NBTTagCompound nbttagcompound) {
+		public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) {
 			for(DimWithPos s : ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.keySet())
 				nbttagcompound.setString(s.toString(), ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(s).toString());
+			return nbttagcompound;
 		}

 		public static WorldData get(World world) {
 			if(world.getMapStorage() == null)
 				return null;

-			WorldData data = (WorldData) world.getMapStorage().loadData(WorldData.class, ID);
+			WorldData data = (WorldData) world.getMapStorage().getOrLoadData(WorldData.class, ID);

 			if (data == null) {
 				data = new WorldData(ID);
@@ -200,7 +201,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 					continue;

 				Block block = getBlockAt(s);
-				if(block == Blocks.piston_extension) {
+				if(block == Blocks.PISTON_EXTENSION) {
 					IBlockState state = getStateAt(s);
 					boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE);
 					EnumFacing dir = state.getValue(BlockPistonMoving.FACING);
@@ -237,7 +238,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 							if(!sticky && tile == null && mat.getMobilityFlag() == EnumPushReaction.NORMAL && srcState.getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(srcState, world, pos2)) {
 								Material destMat = world.getBlockState(pos2.offset(dir)).getMaterial();
 								if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) {
-									world.setBlockState(pos2, Blocks.air.getDefaultState());
+									world.setBlockState(pos2, Blocks.AIR.getDefaultState());
 									world.setBlockState(pos2.offset(dir), srcState, 1 | 2);
 									mappedPositions.put(s, new DimWithPos(world.provider.getDimension(), pos2.offset(dir)));
 								}
@@ -47,7 +47,7 @@ import java.util.List;
 public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable {

 	public BlockPlatform() {
-		super(Material.wood, LibBlockNames.PLATFORM);
+		super(Material.WOOD, LibBlockNames.PLATFORM);
 		setHardness(2.0F);
 		setResistance(5.0F);
 		setSoundType(SoundType.WOOD);
@@ -45,7 +45,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875);

 	public BlockPylon() {
-		super(Material.iron, LibBlockNames.PYLON);
+		super(Material.IRON, LibBlockNames.PYLON);
 		setHardness(5.5F);
 		setSoundType(SoundType.METAL);
 		setLightLevel(0.5F);
@@ -30,7 +30,7 @@ import java.util.Random;
 public class BlockRoot extends BlockMod implements ILexiconable {

 	public BlockRoot() {
-		super(Material.plants, LibBlockNames.ROOT);
+		super(Material.PLANTS, LibBlockNames.ROOT);
 		setHardness(1.2F);
 		setSoundType(SoundType.WOOD);
 	}
@@ -58,7 +58,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable {

 	@Override
 	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
-		return new ItemStack(Blocks.vine);
+		return new ItemStack(Blocks.VINE);
 	}

 	@Override
@@ -44,7 +44,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
 	private final Random random = new Random();

 	public BlockSparkChanger() {
-		super(Material.rock, LibBlockNames.SPARK_CHANGER);
+		super(Material.ROCK, LibBlockNames.SPARK_CHANGER);
 		setHardness(2.0F);
 		setResistance(10.0F);
 		setSoundType(SoundType.STONE);
@@ -87,7 +87,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
 	}

 	@Override
-	public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
 		boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0;
 		boolean powered = state.getValue(BotaniaStateProps.POWERED);

@@ -107,7 +107,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
 			world.updateComparatorOutputLevel(pos, this);
 			changer.markDirty();
 			if(!player.inventory.addItemStackToInventory(cstack))
-				player.dropPlayerItemWithRandomChoice(cstack, false);
+				player.dropItem(cstack, false);
 			return true;
 		} else if(pstack != null && pstack.getItem() == ModItems.sparkUpgrade) {
 			changer.getItemHandler().setStackInSlot(0, pstack.copy().splitStack(1));
@@ -18,8 +18,8 @@ import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityDiggingFX;
+import net.minecraft.client.particle.ParticleManager;
+import net.minecraft.client.particle.ParticleDigging;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -232,7 +232,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I

 	@Override
 	public boolean canPlaceBlockAt(World world, BlockPos pos) {
-		return super.canPlaceBlockAt(world, pos) || world.getBlockState(pos.down()).getBlock() == ModBlocks.redStringRelay || world.getBlockState(pos.down()).getBlock() == Blocks.mycelium;
+		return super.canPlaceBlockAt(world, pos) || world.getBlockState(pos.down()).getBlock() == ModBlocks.redStringRelay || world.getBlockState(pos.down()).getBlock() == Blocks.MYCELIUM;
 	}

 	@Override
@@ -274,8 +274,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
 	}

 	@Override
-	public boolean onBlockEventReceived(World par1World, BlockPos pos, IBlockState state, int par5, int par6) {
-		super.onBlockEventReceived(par1World, pos, state, par5, par6);
+	public boolean eventReceived(IBlockState state, World par1World, BlockPos pos, int par5, int par6) {
+		super.eventReceived(state, par1World, pos, par5, par6);
 		TileEntity tileentity = par1World.getTileEntity(pos);
 		return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false;
 	}
@@ -336,23 +336,23 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
 			d0 = 2.5D;
 		}
 		int i = (int)(150.0D * d0);
-		worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.waterlily.getDefaultState()));
+		worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(Blocks.WATERLILY.getDefaultState()));
 		return true;
 	}

 	@Override
 	@SideOnly(Side.CLIENT)
-	public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) {
+	public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) {
 		if (world.getBlockState(pos).getBlock() == this) {
 			int i = 4;
-			EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory();
+			ParticleDigging.Factory factory = new ParticleDigging.Factory();
 			for (int j = 0; j < i; ++j) {
 				for (int k = 0; k < i; ++k) {
 					for (int l = 0; l < i; ++l) {
 						double d0 = (double)pos.getX() + ((double)j + 0.5D) / (double)i;
 						double d1 = (double)pos.getY() + ((double)k + 0.5D) / (double)i;
 						double d2 = (double)pos.getZ() + ((double)l + 0.5D) / (double)i;
-						effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.waterlily.getDefaultState())));
+						effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - (double)pos.getX() - 0.5D, d1 - (double)pos.getY() - 0.5D, d2 - (double)pos.getZ() - 0.5D, Block.getStateId(Blocks.WATERLILY.getDefaultState())));
 					}
 				}
 			}
@@ -35,7 +35,7 @@ import java.util.List;
 public class BlockStorage extends BlockMod implements ILexiconable {

 	public BlockStorage() {
-		super(Material.iron, LibBlockNames.STORAGE);
+		super(Material.IRON, LibBlockNames.STORAGE);
 		setHardness(3F);
 		setResistance(10F);
 		setSoundType(SoundType.METAL);
@@ -37,7 +37,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75);

 	public BlockTeruTeruBozu() {
-		super(Material.cloth, LibBlockNames.TERU_TERU_BOZU);
+		super(Material.CLOTH, LibBlockNames.TERU_TERU_BOZU);
 	}

 	@Override
@@ -69,11 +69,11 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
 	}

 	private boolean isSunflower(ItemStack stack) {
-		return stack.getItem() == Item.getItemFromBlock(Blocks.double_plant) && stack.getItemDamage() == 0;
+		return stack.getItem() == Item.getItemFromBlock(Blocks.DOUBLE_PLANT) && stack.getItemDamage() == 0;
 	}

 	private boolean isBlueOrchid(ItemStack stack) {
-		return stack.getItem() == Item.getItemFromBlock(Blocks.red_flower) && stack.getItemDamage() == 1;
+		return stack.getItem() == Item.getItemFromBlock(Blocks.RED_FLOWER) && stack.getItemDamage() == 1;
 	}

 	private boolean removeRain(World world) {
@@ -31,7 +31,7 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable {
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16);

 	protected BlockTinyPlanet() {
-		super(Material.rock, LibBlockNames.TINY_PLANET);
+		super(Material.ROCK, LibBlockNames.TINY_PLANET);
 		setHardness(20F);
 		setResistance(100F);
 		setSoundType(SoundType.STONE);
@@ -31,12 +31,12 @@ public final class ModBanners {
 		addPattern(clazz, "spark_recessive", "src", new ItemStack(ModItems.sparkUpgrade, 1, 2));
 		addPattern(clazz, "spark_isolated", "sis", new ItemStack(ModItems.sparkUpgrade, 1, 3));

-		addPattern(clazz, "fish", "fis", new ItemStack(Items.fish));
-		addPattern(clazz, "axe", "axe", new ItemStack(Items.iron_axe));
-		addPattern(clazz, "hoe", "hoe", new ItemStack(Items.iron_hoe));
-		addPattern(clazz, "pickaxe", "pik", new ItemStack(Items.iron_pickaxe));
-		addPattern(clazz, "shovel", "shv", new ItemStack(Items.iron_shovel));
-		addPattern(clazz, "sword", "srd", new ItemStack(Items.iron_sword));
+		addPattern(clazz, "fish", "fis", new ItemStack(Items.FISH));
+		addPattern(clazz, "axe", "axe", new ItemStack(Items.IRON_AXE));
+		addPattern(clazz, "hoe", "hoe", new ItemStack(Items.IRON_HOE));
+		addPattern(clazz, "pickaxe", "pik", new ItemStack(Items.IRON_PICKAXE));
+		addPattern(clazz, "shovel", "shv", new ItemStack(Items.IRON_SHOVEL));
+		addPattern(clazz, "sword", "srd", new ItemStack(Items.IRON_SWORD));
 	}

 	public static void addPattern(Class<? extends Enum<?>> clazz, String name, String id, ItemStack craftingItem) {
@@ -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() {
@@ -39,7 +39,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
 	private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16);

 	public BlockCorporeaCrystalCube() {
-		super(Material.iron, LibBlockNames.CORPOREA_CRYSTAL_CUBE);
+		super(Material.IRON, LibBlockNames.CORPOREA_CRYSTAL_CUBE);
 		setHardness(5.5F);
 		setSoundType(SoundType.METAL);
 		setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true));
@@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable {

 	public BlockCorporeaFunnel() {
-		super(Material.iron, LibBlockNames.CORPOREA_FUNNEL);
+		super(Material.IRON, LibBlockNames.CORPOREA_FUNNEL);
 		setHardness(5.5F);
 		setSoundType(SoundType.METAL);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
@@ -52,7 +52,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab
 	}

 	@Override
-	public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
 		boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0;
 		boolean powered = state.getValue(BotaniaStateProps.POWERED);

@@ -14,7 +14,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.particle.EntityDiggingFX;
+import net.minecraft.client.particle.ParticleDigging;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -38,7 +38,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable {

 	public BlockCorporeaIndex() {
-		super(Material.iron, LibBlockNames.CORPOREA_INDEX);
+		super(Material.IRON, LibBlockNames.CORPOREA_INDEX);
 		setHardness(5.5F);
 		setSoundType(SoundType.METAL);
 	}
@@ -83,11 +83,11 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl

 	@Override
 	@SideOnly(Side.CLIENT)
-	public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer)
+	public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.ParticleManager effectRenderer)
 	{
 		if (world.getBlockState(pos).getBlock() == this) {
 			int i = 4;
-			EntityDiggingFX.Factory factory = new EntityDiggingFX.Factory();
+			ParticleDigging.Factory factory = new ParticleDigging.Factory();
 			for (int j = 0; j < i; ++j) {
 				for (int k = 0; k < i; ++k) {
 					for (int l = 0; l < i; ++l) {
@@ -33,7 +33,7 @@ import java.util.Random;
 public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable {

 	public BlockCorporeaInterceptor() {
-		super(Material.iron, LibBlockNames.CORPOREA_INTERCEPTOR);
+		super(Material.IRON, LibBlockNames.CORPOREA_INTERCEPTOR);
 		setHardness(5.5F);
 		setSoundType(SoundType.METAL);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
@@ -35,7 +35,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement {

 	public BlockCorporeaRetainer() {
-		super(Material.iron, LibBlockNames.CORPOREA_RETAINER);
+		super(Material.IRON, LibBlockNames.CORPOREA_RETAINER);
 		setHardness(5.5F);
 		setSoundType(SoundType.METAL);
 		setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
@@ -57,7 +57,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr
 	}

 	@Override
-	public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
 		boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0;
 		boolean powered = state.getValue(BotaniaStateProps.POWERED);

@@ -36,7 +36,7 @@ import java.util.List;
 public class Block18Stone extends BlockMod implements ILexiconable {

 	public Block18Stone() {
-		super(Material.rock, LibBlockNames.STONE);
+		super(Material.ROCK, LibBlockNames.STONE);
 		setHardness(1.5F);
 		setResistance(10F);
 		setSoundType(SoundType.STONE);
@@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames;
 public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler {

 	public BlockBlaze() {
-		super(Material.iron, LibBlockNames.BLAZE_BLOCK);
+		super(Material.IRON, LibBlockNames.BLAZE_BLOCK);
 		setHardness(3F);
 		setResistance(10F);
 		setSoundType(SoundType.METAL);
@@ -46,7 +46,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler {

 	@Override
 	public int getBurnTime(ItemStack fuel) {
-		return fuel.getItem() == Item.getItemFromBlock(this) ? TileEntityFurnace.getItemBurnTime(new ItemStack(Items.blaze_rod)) * (Botania.gardenOfGlassLoaded ? 5 : 10) : 0;
+		return fuel.getItem() == Item.getItemFromBlock(this) ? TileEntityFurnace.getItemBurnTime(new ItemStack(Items.BLAZE_ROD)) * (Botania.gardenOfGlassLoaded ? 5 : 10) : 0;
 	}

 }