Merge pull request #404 from Arcaratus/bloodmagic1.8

Did ModBlocks

src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -33,7 +33,6 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
 import net.minecraftforge.fml.common.ModContainer;
-import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLInterModComms;
@@ -83,7 +82,7 @@ import WayofTime.alchemicalWizardry.common.ModLivingDropsEvent;
 import WayofTime.alchemicalWizardry.common.NewPacketHandler;
 import WayofTime.alchemicalWizardry.common.achievements.ModAchievements;
 import WayofTime.alchemicalWizardry.common.alchemy.CombinedPotionRegistry;
-import WayofTime.alchemicalWizardry.common.block.ArmourForge;
+import WayofTime.alchemicalWizardry.common.block.BlockArmourForge;
 import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
 import WayofTime.alchemicalWizardry.common.compress.AdvancedCompressionHandler;
 import WayofTime.alchemicalWizardry.common.compress.BaseCompressionHandler;
@@ -117,18 +116,14 @@ import WayofTime.alchemicalWizardry.common.entity.mob.EntityShadeElemental;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntitySmallEarthGolem;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntityWaterElemental;
 import WayofTime.alchemicalWizardry.common.entity.mob.EntityWingedFireDemon;
-import WayofTime.alchemicalWizardry.common.guide.RecipeHolder;
 import WayofTime.alchemicalWizardry.common.harvest.BloodMagicHarvestHandler;
 import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler;
 import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler;
-import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry;
 import WayofTime.alchemicalWizardry.common.items.ItemIncense;
-import WayofTime.alchemicalWizardry.common.items.ItemMailOrderCatalogue;
 import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
 import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour;
 import WayofTime.alchemicalWizardry.common.items.forestry.ItemBloodFrame;
 import WayofTime.alchemicalWizardry.common.items.sigil.holding.HoldingPacketHandler;
-import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour;
 import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth;
 import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmFire;
 import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWater;
@@ -586,7 +581,7 @@ public class AlchemicalWizardry
     {
         int craftingConstant = OreDictionary.WILDCARD_VALUE;
 
-        ModBlocks.registerBlocksInInit();
+        ModBlocks.init();
         //blocks
 
         proxy.registerRenderers();
@@ -810,7 +805,7 @@ public class AlchemicalWizardry
 
         //Gui registration
         UpgradedAltars.loadAltars();
-        ArmourForge.initializeRecipes();
+        BlockArmourForge.initializeRecipes();
         TEPlinth.initialize();
 
         initAlchemyPotionRecipes();

src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java

@@ -32,6 +32,8 @@ public class BloodMagicConfiguration
 
 	public static Configuration config;
 
+	public static String[] blocksToBeDisabled;
+	public static String[] itemsToBeDisabled;
     public static String[] teleposerBlacklist;
     public static String[] blacklist = {};
 
@@ -193,6 +195,9 @@ public class BloodMagicConfiguration
 		AlchemicalWizardry.isDemonRitualCreativeOnly = config.get(tempDemonConfigs, "IsDemonRitualCreativeOnly", false).getBoolean();
 		
 		BoundArmour.tryComplexRendering = config.get("WimpySettings", "UseFancyBoundArmour", true).getBoolean(true);
+
+        blocksToBeDisabled = config.getStringList("Disable blocks here", "WimpySettings", new String[]{""}, "Type in the unlocalized name of the block you want disabled here (separate them using ENTER)");
+        itemsToBeDisabled = config.getStringList("Disable items here", "WimpySettings", new String[]{""}, "Type in the unlocalized name of the item you want disabled (separate them using ENTER)");
 		
 //		ItemIncense.itemDuration = config.get("TestIncenseSettings", "ItemDuration", 100).getInt();
 //		ItemIncense.minValue = config.get("TestIncenseSettings", "MinValue", 0).getInt();
@@ -248,187 +253,49 @@ public class BloodMagicConfiguration
 		config.save();
 	}
 
-	public static void blacklistRituals()
+    public static void blacklistRituals()
-	{
+    {
-		if (AlchemicalWizardry.ritualDisabledWater)
+        if (AlchemicalWizardry.ritualDisabledWater) r("AW001Water");
-		{
+        if (AlchemicalWizardry.ritualDisabledLava) r("AW002Lava");
-			Rituals.ritualMap.remove("AW001Water");
+        if (AlchemicalWizardry.ritualDisabledGreenGrove) r("AW003GreenGrove");
-			Rituals.keyList.remove("AW001Water");
+        if (AlchemicalWizardry.ritualDisabledInterdiction) r("AW004Interdiction");
-		}
+        if (AlchemicalWizardry.ritualDisabledContainment) r("AW005Containment");
-		if (AlchemicalWizardry.ritualDisabledLava)
+        if (AlchemicalWizardry.ritualDisabledBinding) r("AW006Binding");
-		{
+        if (AlchemicalWizardry.ritualDisabledUnbinding) r("AW007Unbinding"); // "A medium dry martini, lemon peel. Shaken, not stirred."
-			Rituals.ritualMap.remove("AW002Lava");
+        if (AlchemicalWizardry.ritualDisabledHighJump) r("AW008HighJump");
-			Rituals.keyList.remove("AW002Lava");
+        if (AlchemicalWizardry.ritualDisabledMagnetism) r("AW009Magnetism");
-		}
+        if (AlchemicalWizardry.ritualDisabledCrusher) r("AW010Crusher");
-		if (AlchemicalWizardry.ritualDisabledGreenGrove)
+        if (AlchemicalWizardry.ritualDisabledSpeed) r("AW011Speed");
-		{
+        if (AlchemicalWizardry.ritualDisabledAnimalGrowth) r("AW012AnimalGrowth");
-			Rituals.ritualMap.remove("AW003GreenGrove");
+        if (AlchemicalWizardry.ritualDisabledSuffering) r("AW013Suffering");
-			Rituals.keyList.remove("AW003GreenGrove");
+        if (AlchemicalWizardry.ritualDisabledRegen) r("AW014Regen");
-		}
+        if (AlchemicalWizardry.ritualDisabledFeatheredKnife) r("AW015FeatheredKnife");
-		if (AlchemicalWizardry.ritualDisabledInterdiction)
+        if (AlchemicalWizardry.ritualDisabledFeatheredEarth) r("AW016FeatheredEarth");
-		{
+        if (AlchemicalWizardry.ritualDisabledGaia) r("AW017Gaia");
-			Rituals.ritualMap.remove("AW004Interdiction");
+        if (AlchemicalWizardry.ritualDisabledCondor) r("AW018Condor");
-			Rituals.keyList.remove("AW004Interdiction");
+        if (AlchemicalWizardry.ritualDisabledFallingTower) r("AW019FallingTower");
-		}
+        if (AlchemicalWizardry.ritualDisabledBalladOfAlchemy) r("AW020BalladOfAlchemy");
-		if (AlchemicalWizardry.ritualDisabledContainment)
+        if (AlchemicalWizardry.ritualDisabledExpulsion) r("AW021Expulsion");
-		{
+        if (AlchemicalWizardry.ritualDisabledSuppression) r("AW022Suppression");
-			Rituals.ritualMap.remove("AW005Containment");
+        if (AlchemicalWizardry.ritualDisabledZephyr) r("AW023Zephyr");
-			Rituals.keyList.remove("AW005Containment");
+        if (AlchemicalWizardry.ritualDisabledHarvest) r("AW024Harvest");
-		}
+        if (AlchemicalWizardry.ritualDisabledConduit) r("AW025Conduit");
-		if (AlchemicalWizardry.ritualDisabledBinding)
+        if (AlchemicalWizardry.ritualDisabledEllipsoid) r("AW026Ellipsoid");
-		{
+        if (AlchemicalWizardry.ritualDisabledEvaporation) r("AW027Evaporation");
-			Rituals.ritualMap.remove("AW006Binding");
+        if (AlchemicalWizardry.ritualDisabledSpawnWard) r("AW028SpawnWard");
-			Rituals.keyList.remove("AW006Binding");
+        if (AlchemicalWizardry.ritualDisabledVeilOfEvil) r("AW029VeilOfEvil");
-		}
+        if (AlchemicalWizardry.ritualDisabledFullStomach) r("AW030FullStomach");
-		if (AlchemicalWizardry.ritualDisabledUnbinding)
+        if (AlchemicalWizardry.ritualDisabledConvocation) r("AW031Convocation");
-		{
+        if (AlchemicalWizardry.ritualDisabledSymmetry) r("AW032Symmetry");
-			Rituals.ritualMap.remove("AW007Unbinding");//007 reporting for duty
+        if (AlchemicalWizardry.ritualDisabledStalling) r("AW033Stalling");
-			Rituals.keyList.remove("AW007Unbinding");
+        if (AlchemicalWizardry.ritualDisabledCrafting) r("AW034Crafting");
-		}
+        if (AlchemicalWizardry.ritualDisabledPhantomHands) r("AW035PhantomHands");
-		if (AlchemicalWizardry.ritualDisabledHighJump)
+        if (AlchemicalWizardry.ritualDisabledSphereIsland) r("AW036SphereIsland");
-		{
+    }
-			Rituals.ritualMap.remove("AW008HighJump");
+
-			Rituals.keyList.remove("AW008HighJump");
+    private static void r(String ritualID)
-		}
+    {
-		if (AlchemicalWizardry.ritualDisabledMagnetism)
+        Rituals.ritualMap.remove(ritualID);
-		{
+        Rituals.keyList.remove(ritualID);
-			Rituals.ritualMap.remove("AW009Magnetism");
+    }
-			Rituals.keyList.remove("AW009Magnetism");
-		}
-		if (AlchemicalWizardry.ritualDisabledCrusher)
-		{
-			Rituals.ritualMap.remove("AW010Crusher");
-			Rituals.keyList.remove("AW010Crusher");
-		}
-		if (AlchemicalWizardry.ritualDisabledSpeed)
-		{
-			Rituals.ritualMap.remove("AW011Speed");
-			Rituals.keyList.remove("AW011Speed");
-		}
-		if (AlchemicalWizardry.ritualDisabledAnimalGrowth)
-		{
-			Rituals.ritualMap.remove("AW012AnimalGrowth");
-			Rituals.keyList.remove("AW012AnimalGrowth");
-		}
-		if (AlchemicalWizardry.ritualDisabledSuffering)
-		{
-			Rituals.ritualMap.remove("AW013Suffering");
-			Rituals.keyList.remove("AW013Suffering");
-		}
-		if (AlchemicalWizardry.ritualDisabledRegen)
-		{
-			Rituals.ritualMap.remove("AW014Regen");
-			Rituals.keyList.remove("AW014Regen");
-		}
-		if (AlchemicalWizardry.ritualDisabledFeatheredKnife)
-		{
-			Rituals.ritualMap.remove("AW015FeatheredKnife");
-			Rituals.keyList.remove("AW015FeatheredKnife");
-		}
-		if (AlchemicalWizardry.ritualDisabledFeatheredEarth)
-		{
-			Rituals.ritualMap.remove("AW016FeatheredEarth");
-			Rituals.keyList.remove("AW016FeatheredEarth");
-		}
-		if (AlchemicalWizardry.ritualDisabledGaia)
-		{
-			Rituals.ritualMap.remove("AW017Gaia");
-			Rituals.keyList.remove("AW017Gaia");
-		}
-		if (AlchemicalWizardry.ritualDisabledCondor)
-		{
-			Rituals.ritualMap.remove("AW018Condor");
-			Rituals.keyList.remove("AW018Condor");
-		}
-		if (AlchemicalWizardry.ritualDisabledFallingTower)
-		{
-			Rituals.ritualMap.remove("AW019FallingTower");
-			Rituals.keyList.remove("AW019FallingTower");
-		}
-		if (AlchemicalWizardry.ritualDisabledBalladOfAlchemy)
-		{
-			Rituals.ritualMap.remove("AW020BalladOfAlchemy");
-			Rituals.keyList.remove("AW020BalladOfAlchemy");
-		}
-		if (AlchemicalWizardry.ritualDisabledExpulsion)
-		{
-			Rituals.ritualMap.remove("AW021Expulsion");
-			Rituals.keyList.remove("AW021Expulsion");
-		}
-		if (AlchemicalWizardry.ritualDisabledSuppression)
-		{
-			Rituals.ritualMap.remove("AW022Suppression");
-			Rituals.keyList.remove("AW022Suppression");
-		}
-		if (AlchemicalWizardry.ritualDisabledZephyr)
-		{
-			Rituals.ritualMap.remove("AW023Zephyr");
-			Rituals.keyList.remove("AW023Zephyr");
-		}
-		if (AlchemicalWizardry.ritualDisabledHarvest)
-		{
-			Rituals.ritualMap.remove("AW024Harvest");
-			Rituals.keyList.remove("AW024Harvest");
-		}
-		if (AlchemicalWizardry.ritualDisabledConduit)
-		{
-			Rituals.ritualMap.remove("AW025Conduit");
-			Rituals.keyList.remove("AW025Conduit");
-		}
-		if (AlchemicalWizardry.ritualDisabledEllipsoid)
-		{
-			Rituals.ritualMap.remove("AW026Ellipsoid");
-			Rituals.keyList.remove("AW026Ellipsoid");
-		}
-		if (AlchemicalWizardry.ritualDisabledEvaporation)
-		{
-			Rituals.ritualMap.remove("AW027Evaporation");
-			Rituals.keyList.remove("AW027Evaporation");
-		}
-		if (AlchemicalWizardry.ritualDisabledSpawnWard)
-		{
-			Rituals.ritualMap.remove("AW028SpawnWard");
-			Rituals.keyList.remove("AW028SpawnWard");
-		}
-		if (AlchemicalWizardry.ritualDisabledVeilOfEvil)
-		{
-			Rituals.ritualMap.remove("AW029VeilOfEvil");
-			Rituals.keyList.remove("AW029VeilOfEvil");
-		}
-		if (AlchemicalWizardry.ritualDisabledFullStomach)
-		{
-			Rituals.ritualMap.remove("AW030FullStomach");
-			Rituals.keyList.remove("AW030FullStomach");
-		}
-		if (AlchemicalWizardry.ritualDisabledConvocation)
-		{
-			Rituals.ritualMap.remove("AW031Convocation");
-			Rituals.keyList.remove("AW031Convocation");
-		}
-		if (AlchemicalWizardry.ritualDisabledSymmetry)
-		{
-			Rituals.ritualMap.remove("AW032Symmetry");
-			Rituals.keyList.remove("AW032Symmetry");
-		}
-		if (AlchemicalWizardry.ritualDisabledStalling)
-		{
-			Rituals.ritualMap.remove("AW033Stalling");
-			Rituals.keyList.remove("AW033Stalling");
-		}
-		if (AlchemicalWizardry.ritualDisabledCrafting)
-		{
-			Rituals.ritualMap.remove("AW034Crafting");
-			Rituals.keyList.remove("AW034Crafting");
-		}
-		if (AlchemicalWizardry.ritualDisabledPhantomHands)
-		{
-			Rituals.ritualMap.remove("AW035PhantomHands");
-			Rituals.keyList.remove("AW035PhantomHands");
-		}
-		if (AlchemicalWizardry.ritualDisabledSphereIsland)
-		{
-			Rituals.ritualMap.remove("AW036SphereIsland");
-			Rituals.keyList.remove("AW036SphereIsland");
-		}
-	}
 }

src/main/java/WayofTime/alchemicalWizardry/ModBlocks.java

@@ -1,24 +1,25 @@
 package WayofTime.alchemicalWizardry;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import WayofTime.alchemicalWizardry.common.block.ArmourForge;
+import WayofTime.alchemicalWizardry.common.block.BlockArmourForge;
 import WayofTime.alchemicalWizardry.common.block.BlockAlchemicCalcinator;
 import WayofTime.alchemicalWizardry.common.block.BlockAltar;
 import WayofTime.alchemicalWizardry.common.block.BlockBelljar;
 import WayofTime.alchemicalWizardry.common.block.BlockBloodLightSource;
 import WayofTime.alchemicalWizardry.common.block.BlockConduit;
-import WayofTime.alchemicalWizardry.common.block.BlockCrucible;
+import WayofTime.alchemicalWizardry.common.block.BlockIncenseCrucible;
 import WayofTime.alchemicalWizardry.common.block.BlockCrystal;
 import WayofTime.alchemicalWizardry.common.block.BlockDemonPortal;
 import WayofTime.alchemicalWizardry.common.block.BlockEnchantmentGlyph;
-import WayofTime.alchemicalWizardry.common.block.BlockHomHeart;
+import WayofTime.alchemicalWizardry.common.block.BlockSpellTable;
 import WayofTime.alchemicalWizardry.common.block.BlockMasterStone;
 import WayofTime.alchemicalWizardry.common.block.BlockPedestal;
 import WayofTime.alchemicalWizardry.common.block.BlockPlinth;
 import WayofTime.alchemicalWizardry.common.block.BlockReagentConduit;
 import WayofTime.alchemicalWizardry.common.block.BlockSchematicSaver;
-import WayofTime.alchemicalWizardry.common.block.BlockSocket;
+import WayofTime.alchemicalWizardry.common.block.BlockFilledSocket;
 import WayofTime.alchemicalWizardry.common.block.BlockSpectralContainer;
 import WayofTime.alchemicalWizardry.common.block.BlockSpellEffect;
 import WayofTime.alchemicalWizardry.common.block.BlockSpellEnhancement;
@@ -26,20 +27,20 @@ import WayofTime.alchemicalWizardry.common.block.BlockSpellModifier;
 import WayofTime.alchemicalWizardry.common.block.BlockSpellParadigm;
 import WayofTime.alchemicalWizardry.common.block.BlockStabilityGlyph;
 import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
-import WayofTime.alchemicalWizardry.common.block.BlockWritingTable;
+import WayofTime.alchemicalWizardry.common.block.BlockChemistrySet;
-import WayofTime.alchemicalWizardry.common.block.BloodRune;
+import WayofTime.alchemicalWizardry.common.block.BlockBloodRune;
-import WayofTime.alchemicalWizardry.common.block.BloodStoneBrick;
+import WayofTime.alchemicalWizardry.common.block.BlockBloodStoneBrick;
-import WayofTime.alchemicalWizardry.common.block.EfficiencyRune;
+import WayofTime.alchemicalWizardry.common.block.BlockEfficiencyRune;
-import WayofTime.alchemicalWizardry.common.block.EmptySocket;
+import WayofTime.alchemicalWizardry.common.block.BlockEmptySocket;
-import WayofTime.alchemicalWizardry.common.block.ImperfectRitualStone;
+import WayofTime.alchemicalWizardry.common.block.BlockImperfectRitualStone;
-import WayofTime.alchemicalWizardry.common.block.LargeBloodStoneBrick;
+import WayofTime.alchemicalWizardry.common.block.BlockLargeBloodStoneBrick;
-import WayofTime.alchemicalWizardry.common.block.LifeEssenceBlock;
+import WayofTime.alchemicalWizardry.common.block.BlockLifeEssence;
-import WayofTime.alchemicalWizardry.common.block.MimicBlock;
+import WayofTime.alchemicalWizardry.common.block.BlockMimic;
-import WayofTime.alchemicalWizardry.common.block.RitualStone;
+import WayofTime.alchemicalWizardry.common.block.BlockRitualStone;
-import WayofTime.alchemicalWizardry.common.block.RuneOfSacrifice;
+import WayofTime.alchemicalWizardry.common.block.BlockRuneOfSacrifice;
-import WayofTime.alchemicalWizardry.common.block.RuneOfSelfSacrifice;
+import WayofTime.alchemicalWizardry.common.block.BlockRuneOfSelfSacrifice;
-import WayofTime.alchemicalWizardry.common.block.SpectralBlock;
+import WayofTime.alchemicalWizardry.common.block.BlockSpectral;
-import WayofTime.alchemicalWizardry.common.block.SpeedRune;
+import WayofTime.alchemicalWizardry.common.block.BlockSpeedRune;
 import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.BlockDemonChest;
 import WayofTime.alchemicalWizardry.common.items.ItemBlockCrystalBelljar;
 import WayofTime.alchemicalWizardry.common.items.ItemBloodRuneBlock;
@@ -51,6 +52,8 @@ import WayofTime.alchemicalWizardry.common.items.ItemSpellModifierBlock;
 import WayofTime.alchemicalWizardry.common.items.ItemSpellParadigmBlock;
 import WayofTime.alchemicalWizardry.common.items.ItemStabilityGlyphBlock;
 
+import java.util.ArrayList;
+
 /**
  * Created with IntelliJ IDEA.
  * User: Pokefenn
@@ -62,11 +65,11 @@ public class ModBlocks
     public static Block bloodStoneBrick;
     public static Block largeBloodStoneBrick;
     public static BlockAltar blockAltar;
-    public static BloodRune bloodRune;
+    public static BlockBloodRune bloodRune;
-    public static SpeedRune speedRune;
+    public static BlockSpeedRune speedRune;
-    public static EfficiencyRune efficiencyRune;
+    public static BlockEfficiencyRune efficiencyRune;
-    public static RuneOfSacrifice runeOfSacrifice;
+    public static BlockRuneOfSacrifice runeOfSacrifice;
-    public static RuneOfSelfSacrifice runeOfSelfSacrifice;
+    public static BlockRuneOfSelfSacrifice runeOfSelfSacrifice;
     public static Block blockMasterStone;
     public static Block ritualStone;
     public static Block imperfectRitualStone;
@@ -74,7 +77,7 @@ public class ModBlocks
     public static Block emptySocket;
     public static Block armourForge;
     public static Block blockWritingTable;
-    public static Block blockHomHeart;
+    public static Block blockSpellTable;
     public static Block blockPedestal;
     public static Block blockPlinth;
     public static Block blockLifeEssence;
@@ -90,7 +93,7 @@ public class ModBlocks
     public static Block blockBuildingSchematicSaver;
     public static Block blockDemonPortal;
     public static Block blockReagentConduit;
-    public static Block blockAlchemicCalcinator;
+    public static Block blockAlchemicalCalcinator;
     public static Block blockCrystalBelljar;
     public static Block blockDemonChest;
     public static Block blockCrystal;
@@ -99,98 +102,94 @@ public class ModBlocks
     public static Block blockStabilityGlyph;
     public static Block blockCrucible;
 
+    public static ArrayList<String> blocksNotToBeRegistered = new ArrayList<String>();
+
     public static void init()
     {
-        blockAltar = new BlockAltar();
+        blockAltar = (BlockAltar) registerBlock(new BlockAltar(), "altar");
-        bloodRune = new BloodRune();
+        bloodRune = (BlockBloodRune) registerBlock(new BlockBloodRune(), ItemBloodRuneBlock.class, ModBlocks.bloodRune.getUnlocalizedName());
-        speedRune = new SpeedRune();
+        speedRune = (BlockSpeedRune) registerBlock(new BlockSpeedRune(), "speed_rune");
-        efficiencyRune = new EfficiencyRune();
+        efficiencyRune = (BlockEfficiencyRune) registerBlock(new BlockEfficiencyRune(), "efficiency_rune");
-        runeOfSacrifice = new RuneOfSacrifice();
+        runeOfSacrifice = (BlockRuneOfSacrifice) registerBlock(new BlockRuneOfSacrifice(), "sacrifice_rune");
-        runeOfSelfSacrifice = new RuneOfSelfSacrifice();
+        runeOfSelfSacrifice = (BlockRuneOfSelfSacrifice) registerBlock(new BlockRuneOfSelfSacrifice(), "self_sacrifice_rune");
-        blockTeleposer = new BlockTeleposer();
+        blockTeleposer = registerBlock(new BlockTeleposer(), "teleposer");
-        spectralBlock = new SpectralBlock();
+        spectralBlock = registerBlock(new BlockSpectral(), "spectral_block");
-        ritualStone = new RitualStone();
+        ritualStone = registerBlock(new BlockRitualStone(), "ritual_stone");
-        blockMasterStone = new BlockMasterStone();
+        blockMasterStone = registerBlock(new BlockMasterStone(), "master_ritual_stone");
-        imperfectRitualStone = new ImperfectRitualStone();
+        imperfectRitualStone = registerBlock(new BlockImperfectRitualStone(), "imperfect_ritual_stone");
-        bloodSocket = new BlockSocket();
+        emptySocket = registerBlock(new BlockEmptySocket(), "empty_socket");
-        armourForge = new ArmourForge();
+        bloodSocket = registerBlock(new BlockFilledSocket(), "filled_socket");
-        emptySocket = new EmptySocket();
+        armourForge = registerBlock(new BlockArmourForge(), "soul_armour_forge");
-        largeBloodStoneBrick = new LargeBloodStoneBrick();
+        largeBloodStoneBrick = registerBlock(new BlockLargeBloodStoneBrick(), "large_bloodstone_brick");
-        bloodStoneBrick = new BloodStoneBrick();
+        bloodStoneBrick = registerBlock(new BlockBloodStoneBrick(), "bloodstone_brick");
-        blockWritingTable = new BlockWritingTable();
+        blockWritingTable = registerBlock(new BlockChemistrySet(), "chemistry_set");
-        blockHomHeart = new BlockHomHeart();
+        blockSpellTable = registerBlock(new BlockSpellTable(), "spell_table");
-        blockPedestal = new BlockPedestal();
+        blockPedestal = registerBlock(new BlockPedestal(), "pedestal");
-        blockPlinth = new BlockPlinth();
+        blockPlinth = registerBlock(new BlockPlinth(), "plinth");
-        blockConduit = new BlockConduit();
+        blockConduit = registerBlock(new BlockConduit(), "conduit");
-        blockBloodLight = new BlockBloodLightSource();
+        blockBloodLight = registerBlock(new BlockBloodLightSource(), "blood_light");
-        blockSpellEffect = new BlockSpellEffect();
+        blockSpellEffect = registerBlock(new BlockSpellEffect(), "spell_effect");
-        blockSpellParadigm = new BlockSpellParadigm();
+        blockSpellParadigm = registerBlock(new BlockSpellParadigm(), ItemSpellParadigmBlock.class, "spell_paradigm");
-        blockSpellModifier = new BlockSpellModifier();
+        blockSpellModifier = registerBlock(new BlockSpellModifier(), ItemSpellEnhancementBlock.class, "spell_modifier");
-        blockSpellEnhancement = new BlockSpellEnhancement();
+        blockSpellEnhancement = registerBlock(new BlockSpellEnhancement(), ItemSpellModifierBlock.class, "spell_enhancement");
-        blockSpectralContainer = new BlockSpectralContainer();
+        blockSpectralContainer = registerBlock(new BlockSpectralContainer(), ItemSpellEffectBlock.class, "spectral_container");
-        blockDemonPortal = new BlockDemonPortal();
+        blockDemonPortal = registerBlock(new BlockDemonPortal(), "demon_portal");
-        blockBuildingSchematicSaver = new BlockSchematicSaver();
+        blockBuildingSchematicSaver = registerBlock(new BlockSchematicSaver(), "schematic_saver");
-        blockReagentConduit = new BlockReagentConduit();
+        blockReagentConduit = registerBlock(new BlockReagentConduit(), "reagent_conduit");
-        blockAlchemicCalcinator = new BlockAlchemicCalcinator();
+        blockAlchemicalCalcinator = registerBlock(new BlockAlchemicCalcinator(), "alchemical_calcinator");
-        blockCrystalBelljar = new BlockBelljar();
+        blockCrystalBelljar = registerBlock(new BlockBelljar(), ItemBlockCrystalBelljar.class, "belljar");
-        blockDemonChest = new BlockDemonChest();
+        blockDemonChest = registerBlock(new BlockDemonChest(), "demon_chest");
-        blockCrystal = new BlockCrystal();
+        blockCrystal = registerBlock(new BlockCrystal(), ItemCrystalBlock.class, "crystal_block");
-        blockMimic = new MimicBlock();
+        blockMimic = registerBlock(new BlockMimic(), "mimic_block");
         
-        blockLifeEssence = new LifeEssenceBlock();
+        blockLifeEssence = registerBlock(new BlockLifeEssence(), "life_essence");
-        blockEnchantmentGlyph = new BlockEnchantmentGlyph();
+        blockEnchantmentGlyph = registerBlock(new BlockEnchantmentGlyph(), ItemEnchantmentGlyphBlock.class, "enchantment_glyph");
-        blockStabilityGlyph = new BlockStabilityGlyph();
+        blockStabilityGlyph = registerBlock(new BlockStabilityGlyph(), ItemStabilityGlyphBlock.class, "stability_glyph");
-        blockCrucible = new BlockCrucible();
+        blockCrucible = registerBlock(new BlockIncenseCrucible(), "incense_cruicible");
     }
 
-    public static void registerBlocksInPre()
+    public static Block registerBlock(Block block, String unlocalizedName)
     {
-        GameRegistry.registerBlock(ModBlocks.blockAltar, "Altar");
+        block.setUnlocalizedName(unlocalizedName);
-        GameRegistry.registerBlock(ModBlocks.bloodRune, ItemBloodRuneBlock.class, "AlchemicalWizardry" + (ModBlocks.bloodRune.getUnlocalizedName().substring(5)));
-        GameRegistry.registerBlock(ModBlocks.blockLifeEssence, "lifeEssence");
-        GameRegistry.registerBlock(ModBlocks.speedRune, "speedRune");
-        GameRegistry.registerBlock(ModBlocks.efficiencyRune, "efficiencyRune");
-        GameRegistry.registerBlock(ModBlocks.runeOfSacrifice, "runeOfSacrifice");
-        GameRegistry.registerBlock(ModBlocks.runeOfSelfSacrifice, "runeOfSelfSacrifice");
-        GameRegistry.registerBlock(ModBlocks.ritualStone, "ritualStone");
-        GameRegistry.registerBlock(ModBlocks.blockMasterStone, "masterStone");
-        GameRegistry.registerBlock(ModBlocks.bloodSocket, "bloodSocket");
-        GameRegistry.registerBlock(ModBlocks.imperfectRitualStone, "imperfectRitualStone");
 
-        GameRegistry.registerBlock(ModBlocks.armourForge, "armourForge");
+//        if (!)
-        GameRegistry.registerBlock(ModBlocks.emptySocket, "emptySocket");
+        {
-        GameRegistry.registerBlock(ModBlocks.bloodStoneBrick, "bloodStoneBrick");
+            block.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
-        GameRegistry.registerBlock(ModBlocks.largeBloodStoneBrick, "largeBloodStoneBrick");
+        }
-        GameRegistry.registerBlock(ModBlocks.blockWritingTable, "blockWritingTable");
-        GameRegistry.registerBlock(ModBlocks.blockHomHeart, "blockHomHeart");
-        GameRegistry.registerBlock(ModBlocks.blockPedestal, "blockPedestal");
-        GameRegistry.registerBlock(ModBlocks.blockPlinth, "blockPlinth");
-        GameRegistry.registerBlock(ModBlocks.blockTeleposer, "blockTeleposer");
-        GameRegistry.registerBlock(ModBlocks.spectralBlock, "spectralBlock");
-        GameRegistry.registerBlock(ModBlocks.blockBloodLight, "bloodLight");
 
-        GameRegistry.registerBlock(ModBlocks.blockConduit, "blockConduit");
+        blocksNotToBeRegistered.clear();
-        GameRegistry.registerBlock(ModBlocks.blockSpellParadigm, ItemSpellParadigmBlock.class, "AlchemicalWizardry" + (ModBlocks.blockSpellParadigm.getUnlocalizedName()));
+        for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled)
-        GameRegistry.registerBlock(ModBlocks.blockSpellEnhancement, ItemSpellEnhancementBlock.class, "AlchemicalWizardry" + (ModBlocks.blockSpellEnhancement.getUnlocalizedName()));
+        {
-        GameRegistry.registerBlock(ModBlocks.blockSpellModifier, ItemSpellModifierBlock.class, "AlchemicalWizardry" + (ModBlocks.blockSpellModifier.getUnlocalizedName()));
+            if (unlocName.equals(unlocalizedName))
-        GameRegistry.registerBlock(ModBlocks.blockSpellEffect, ItemSpellEffectBlock.class, "AlchemicalWizardry" + (ModBlocks.blockSpellEffect.getUnlocalizedName()));
+            {
+                blocksNotToBeRegistered.add(unlocName);
+            }
+        }
+        if (!blocksNotToBeRegistered.contains(unlocalizedName))
+        {
+            GameRegistry.registerBlock(block, unlocalizedName);
+        }
 
-        GameRegistry.registerBlock(ModBlocks.blockSpectralContainer, "spectralContainer");
+        return block;
-        GameRegistry.registerBlock(ModBlocks.blockDemonPortal, "demonPortalMain");
-        GameRegistry.registerBlock(ModBlocks.blockBuildingSchematicSaver, "blockSchemSaver");
-        GameRegistry.registerBlock(ModBlocks.blockReagentConduit, "blockReagentConduit");
-        GameRegistry.registerBlock(ModBlocks.blockAlchemicCalcinator, "blockAlchemicCalcinator");
-        GameRegistry.registerBlock(ModBlocks.blockCrystalBelljar, ItemBlockCrystalBelljar.class, "blockCrystalBelljar");
-        GameRegistry.registerBlock(ModBlocks.blockDemonChest, "blockDemonChest");
-        GameRegistry.registerBlock(ModBlocks.blockCrystal, ItemCrystalBlock.class, "blockCrystal");
-        GameRegistry.registerBlock(ModBlocks.blockMimic, "blockMimic");
-        GameRegistry.registerBlock(ModBlocks.blockEnchantmentGlyph, ItemEnchantmentGlyphBlock.class, "blockEnchantmentGlyph");
-        GameRegistry.registerBlock(ModBlocks.blockStabilityGlyph, ItemStabilityGlyphBlock.class, "blockStabilityGlyph");
-        
-        GameRegistry.registerBlock(ModBlocks.blockCrucible, "blockCrucible");
     }
 
-    public static void registerBlocksInInit()
+    public static Block registerBlock(Block block, Class<? extends ItemBlock> itemBlockClass, String unlocalizedName)
     {
+        block.setCreativeTab(AlchemicalWizardry.tabBloodMagic);
+
+        for (String unlocName : BloodMagicConfiguration.blocksToBeDisabled)
+        {
+            System.out.println(unlocName);
+            if (unlocName.equals(unlocalizedName))
+            {
+                blocksNotToBeRegistered.add(unlocName);
+            }
+        }
+        if (!blocksNotToBeRegistered.contains(unlocalizedName))
+        {
+            GameRegistry.registerBlock(block, itemBlockClass, unlocalizedName);
+        }
+
+        return block;
     }
 }

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockArmourForge.java

@@ -7,11 +7,8 @@ import WayofTime.alchemicalWizardry.common.ArmourComponent;
 import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
 import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -20,31 +17,25 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ArmourForge extends Block
+public class BlockArmourForge extends Block
 {
-    public static List<ArmourComponent> helmetList = new ArrayList();
+    public List<ArmourComponent> helmetList = new ArrayList();
-    public static List<ArmourComponent> plateList = new ArrayList();
+    public List<ArmourComponent> plateList = new ArrayList();
-    public static List<ArmourComponent> leggingsList = new ArrayList();
+    public List<ArmourComponent> leggingsList = new ArrayList();
-    public static List<ArmourComponent> bootsList = new ArrayList();
+    public List<ArmourComponent> bootsList = new ArrayList();
 
-    public ArmourForge()
+    public BlockArmourForge()
     {
         super(Material.iron);
         setHardness(2.0F);
         setResistance(5.0F);
         setCreativeTab(AlchemicalWizardry.tabBloodMagic);
-        this.setBlockName("armourForge");
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister iconRegister)
-    {
-        this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:SoulForge");
     }
 
     @Override

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodRune.java

@@ -14,7 +14,7 @@ import net.minecraft.util.IIcon;
 
 import java.util.List;
 
-public class BloodRune extends Block
+public class BlockBloodRune extends Block
 {
     //private Icon bloodRuneIcon;
     @SideOnly(Side.CLIENT)
@@ -28,7 +28,7 @@ public class BloodRune extends Block
     @SideOnly(Side.CLIENT)
     private IIcon accelerationRuneIcon;
 
-    public BloodRune()
+    public BlockBloodRune()
     {
         super(Material.iron);
         this.setBlockName("bloodRune");

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodStoneBrick.java

@@ -7,9 +7,9 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class BloodStoneBrick extends Block
+public class BlockBloodStoneBrick extends Block
 {
-    public BloodStoneBrick()
+    public BlockBloodStoneBrick()
     {
         super(Material.iron);
         setHardness(2.0F);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockChemistrySet.java

@@ -22,7 +22,7 @@ import net.minecraft.world.World;
 import java.util.List;
 import java.util.Random;
 
-public class BlockWritingTable extends BlockContainer
+public class BlockChemistrySet extends BlockContainer
 {
     @SideOnly(Side.CLIENT)
     private IIcon topIcon;
@@ -31,13 +31,11 @@ public class BlockWritingTable extends BlockContainer
     @SideOnly(Side.CLIENT)
     private IIcon bottomIcon;
 
-    public BlockWritingTable()
+    public BlockChemistrySet()
     {
         super(Material.wood);
         setHardness(2.0F);
         setResistance(5.0F);
-        this.setBlockName("blockWritingTable");
-        setCreativeTab(AlchemicalWizardry.tabBloodMagic);
     }
 
     @Override

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEfficiencyRune.java

@@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class EfficiencyRune extends BloodRune
+public class BlockEfficiencyRune extends BlockBloodRune
 {
-    public EfficiencyRune()
+    public BlockEfficiencyRune()
     {
         super();
         this.setBlockName("efficiencyRune");

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEmptySocket.java

@@ -7,9 +7,9 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class EmptySocket extends Block
+public class BlockEmptySocket extends Block
 {
-    public EmptySocket()
+    public BlockEmptySocket()
     {
         super(Material.iron);
         setHardness(2.0F);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockFilledSocket.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,58 +16,27 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockSocket extends BlockContainer
+public class BlockFilledSocket extends BlockContainer
 {
-    @SideOnly(Side.CLIENT)
+    public BlockFilledSocket()
-    private IIcon topIcon;
-    @SideOnly(Side.CLIENT)
-    private IIcon sideIcon2;
-    @SideOnly(Side.CLIENT)
-    private IIcon bottomIcon;
-
-    public BlockSocket()
     {
         super(Material.rock);
         setHardness(2.0F);
         setResistance(5.0F);
-        setCreativeTab(AlchemicalWizardry.tabBloodMagic);
-        this.setBlockName("bloodSocket");
         //func_111022_d("AlchemicalWizardry:blocks");
     }
 
     @Override
-    @SideOnly(Side.CLIENT)
+    public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
-    public void registerBlockIcons(IIconRegister iconRegister)
     {
-        this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
+        TESocket tileEntity = (TESocket) world.getTileEntity(blockPos);
-        this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
-        this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int side, int meta)
-    {
-        switch (side)
-        {
-            case 0:
-                return bottomIcon;
-            case 1:
-                return topIcon;
-            default:
-                return sideIcon2;
-        }
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
-    {
-        TESocket tileEntity = (TESocket) world.getTileEntity(x, y, z);
 
         if (tileEntity == null || player.isSneaking())
         {
@@ -96,12 +66,12 @@ public class BlockSocket extends BlockContainer
             tileEntity.setActive();
             return true;
         }
-        world.markBlockForUpdate(x, y, z);
+        world.markBlockForUpdate(blockPos);
         return false;
     }
 
     @Override
-    public void breakBlock(World world, int x, int y, int z, Block par5, int par6)
+    public void breakBlock(World world, BlockPos blockPos, Block par5, int par6)
     {
         dropItems(world, x, y, z);
         super.breakBlock(world, x, y, z, par5, par6);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockImperfectRitualStone.java

@@ -16,9 +16,9 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
 
-public class ImperfectRitualStone extends Block
+public class BlockImperfectRitualStone extends Block
 {
-    public ImperfectRitualStone()
+    public BlockImperfectRitualStone()
     {
         super(Material.iron);
         setHardness(2.0F);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockIncenseCrucible.java

@@ -21,7 +21,7 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TECrucible;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BlockCrucible extends BlockContainer
+public class BlockIncenseCrucible extends BlockContainer
 {
 	@SideOnly(Side.CLIENT)
     private IIcon topIcon;
@@ -30,7 +30,7 @@ public class BlockCrucible extends BlockContainer
     @SideOnly(Side.CLIENT)
     private IIcon bottomIcon;
     
-	public BlockCrucible() 
+	public BlockIncenseCrucible()
 	{
 		super(Material.anvil);
 		this.setHardness(2.0f);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockLargeBloodStoneBrick.java

@@ -7,9 +7,9 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class LargeBloodStoneBrick extends Block
+public class BlockLargeBloodStoneBrick extends Block
 {
-    public LargeBloodStoneBrick()
+    public BlockLargeBloodStoneBrick()
     {
         super(Material.iron);
         setHardness(2.0F);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockLifeEssence.java

@@ -10,9 +10,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidClassic;
 
-public class LifeEssenceBlock extends BlockFluidClassic
+public class BlockLifeEssence extends BlockFluidClassic
 {
-    public LifeEssenceBlock()
+    public BlockLifeEssence()
     {
         super(AlchemicalWizardry.lifeEssenceFluid, Material.water);
         AlchemicalWizardry.lifeEssenceFluid.setBlock(this);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMimic.java

@@ -21,9 +21,9 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TEMimicBlock;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class MimicBlock extends BlockContainer
+public class BlockMimic extends BlockContainer
 {
-	public MimicBlock() 
+	public BlockMimic()
 	{
 		super(Material.water);
 		setHardness(2.0F);
@@ -151,7 +151,7 @@ public class MimicBlock extends BlockContainer
                     break;
             }
 
-            MimicBlock.addHitEffect(TE, target, xOffset, yOffset, zOffset, null, effectRenderer);
+            BlockMimic.addHitEffect(TE, target, xOffset, yOffset, zOffset, null, effectRenderer);
 
             return true;
 

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockRitualStone.java

@@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class RitualStone extends Block implements IRitualStone
+public class BlockRitualStone extends Block implements IRitualStone
 {
     @SideOnly(Side.CLIENT)
     private IIcon blankIcon;
@@ -31,7 +31,7 @@ public class RitualStone extends Block implements IRitualStone
     @SideOnly(Side.CLIENT)
     private IIcon dawnStoneIcon;
 
-    public RitualStone()
+    public BlockRitualStone()
     {
         super(Material.iron);
         setHardness(2.0F);

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockRuneOfSacrifice.java

@@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class RuneOfSacrifice extends BloodRune
+public class BlockRuneOfSacrifice extends BlockBloodRune
 {
-    public RuneOfSacrifice()
+    public BlockRuneOfSacrifice()
     {
         super();
         this.setBlockName("runeOfSacrifice");

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockRuneOfSelfSacrifice.java

@@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class RuneOfSelfSacrifice extends BloodRune
+public class BlockRuneOfSelfSacrifice extends BlockBloodRune
 {
-    public RuneOfSelfSacrifice()
+    public BlockRuneOfSelfSacrifice()
     {
         super();
         this.setBlockName("runeOfSelfSacrifice");

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectral.java

@@ -17,9 +17,9 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class SpectralBlock extends BlockContainer
+public class BlockSpectral extends BlockContainer
 {
-    public SpectralBlock()
+    public BlockSpectral()
     {
         super(Material.rock);
         this.setBlockName("spectralBlock");

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpeedRune.java

@@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
 
-public class SpeedRune extends BloodRune
+public class BlockSpeedRune extends BlockBloodRune
 {
-    public SpeedRune()
+    public BlockSpeedRune()
     {
         super();
         this.setBlockName("speedRune");

src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellTable.java

@@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockHomHeart extends BlockContainer
+public class BlockSpellTable extends BlockContainer
 {
     @SideOnly(Side.CLIENT)
     private IIcon bottomIcon;
@@ -24,7 +24,7 @@ public class BlockHomHeart extends BlockContainer
     @SideOnly(Side.CLIENT)
     private IIcon sideIcon;
 
-    public BlockHomHeart()
+    public BlockSpellTable()
     {
         super(Material.rock);
         setHardness(2.0F);

src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java

@@ -10,7 +10,7 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
 import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.IFadedRune;
-import WayofTime.alchemicalWizardry.common.block.BloodRune;
+import WayofTime.alchemicalWizardry.common.block.BlockBloodRune;
 
 public class UpgradedAltars
 {
@@ -46,7 +46,7 @@ public class UpgradedAltars
         	
             if (ac.isBloodRune())
             {
-                if (!(block instanceof BloodRune))
+                if (!(block instanceof BlockBloodRune))
                 {
                     return false;
                 }
@@ -85,14 +85,14 @@ public class UpgradedAltars
                 Block testBlock = state.getBlock();
                 int meta = testBlock.getMetaFromState(state);
                 
-                if (testBlock instanceof BloodRune)
+                if (testBlock instanceof BlockBloodRune)
                 {
                     if (testBlock instanceof IFadedRune && altarTier > ((IFadedRune)testBlock).getAltarTierLimit(meta))
                     {
                         return UpgradedAltars.getUpgrades(world, pos, ((IFadedRune)testBlock).getAltarTierLimit(meta));
                     }
                     
-                    switch (((BloodRune) testBlock).getRuneEffect(meta))
+                    switch (((BlockBloodRune) testBlock).getRuneEffect(meta))
                     {
                         case 1:
                             upgrades.addSpeedUpgrade();

src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java

@@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.ModBlocks;
 import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
 import WayofTime.alchemicalWizardry.api.rituals.Rituals;
-import WayofTime.alchemicalWizardry.common.block.RitualStone;
+import WayofTime.alchemicalWizardry.common.block.BlockRitualStone;
 import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -75,7 +75,7 @@ public class ItemRitualDismantler extends EnergyItems
 
             for (RitualComponent rc : ritualList)
             {
-                if (!world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) && world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) instanceof RitualStone)
+                if (!world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) && world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) instanceof BlockRitualStone)
                 {
                     if (freeSpace >= 0)
                     {

src/main/resources/assets/alchemicalwizardry/lang/en_US.lang

@@ -18,7 +18,7 @@ tile.armourForge.name=Soul Armour Forge
 tile.emptySocket.name=Empty Socket
 tile.bloodStoneBrick.name=Bloodstone Brick
 tile.largeBloodStoneBrick.name=Large Bloodstone Brick
-tile.blockWritingTable.name=Alchemic Chemistry Set
+tile.chemistry_set.name=Alchemical Chemistry Set
 tile.blockHomHeart.name=Spell Table
 tile.bloodPedestal.name=Arcane Pedestal
 tile.bloodPlinth.name=Arcane Plinth
@@ -51,7 +51,7 @@ tile.blockSpellEffect.fire.name=Crucible of Fire
 tile.blockSpellEffect.ice.name=Ice Maker
 tile.blockSpellEffect.wind.name=Wind Generator
 tile.blockSpellEffect.earth.name=Earth Former
-tile.alchemicCalcinator.name=Alchemic Calcinator
+tile.alchemical_calcinator.name=Alchemical Calcinator
 tile.crystalBelljar.name=Crystal Belljar
 tile.blockReagentConduit.name=Alchemy Relay
 tile.lifeEssenceFluidBlock.name=Life Essence