This commit is big? Says who?

- I broke ModStats, and will be fixing it.
- Converted to libsandstone, our awesome new mod framework.
Found here,
https://www.github.com/EnderWizards/libsandstone
- Reliquary *should* be 1.7.10 compatible out of the box.
Don't quote me on that.
- Finally implemented the amazing TOML config system, with
some help
from libsandstone.
- Serpent Staff now works, and is pretty awesome (cool
particle effects included).
- Moved stuff around. I think I'm finally happy with the
package structure.

src/main/java/xreliquary/CreativeTabXR.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
-import xreliquary.init.ContentHandler;
+import lib.enderwizards.sandstone.init.ContentHandler;
 import xreliquary.lib.Names;
 
 public class CreativeTabXR extends CreativeTabs {

src/main/java/xreliquary/Reliquary.java

@@ -1,24 +1,28 @@
 package xreliquary;
 
+import java.io.File;
+
+import lib.enderwizards.sandstone.Sandstone;
+import lib.enderwizards.sandstone.mod.SandstoneMod;
+import lib.enderwizards.sandstone.mod.config.Configuration;
+import lib.enderwizards.sandstone.mod.config.TomlConfig;
 import net.minecraft.item.Item;
+
 import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.modstats.ModstatInfo;
 import org.modstats.Modstats;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-
-// TODO: Use jTOML (https://github.com/asafh/jtoml) over Forge's configuration system. This will allow for a better/cleaner syntax, since we only need the config for options now (since IDs don't conflict anymore, because they don't exist).
-import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.MinecraftForge;
-
 import xreliquary.items.ItemDestructionCatalyst;
 import xreliquary.util.alkahestry.Alkahestry;
 import xreliquary.lib.Reference;
 import xreliquary.common.CommonProxy;
 import xreliquary.util.alkahestry.AlkahestRecipe;
-import xreliquary.util.LogHelper;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -32,7 +36,8 @@
 import cpw.mods.fml.relauncher.Side;
 
 @ModstatInfo(prefix = "reliquary")
-@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.VERSION)
+@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.VERSION, dependencies = "required-after:libsandstone")
+@SandstoneMod(basePackage = "xreliquary")
 public class Reliquary {
 
 	@Instance(Reference.MOD_ID)
@@ -41,39 +46,40 @@ public class Reliquary {
 	@SidedProxy(clientSide = Reference.CLIENT_PROXY, serverSide = Reference.COMMON_PROXY)
 	public static CommonProxy PROXY;
 
-	public static Configuration CONFIG;
+	public static TomlConfig CONFIG;
 	public static CreativeTabs CREATIVE_TAB = new CreativeTabXR(CreativeTabs.getNextID(), Reference.MOD_ID);
+    public static Logger LOGGER = LogManager.getLogger(Reference.MOD_ID);
 
-	@EventHandler
+    @EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
-		CONFIG = new Configuration(event.getSuggestedConfigurationFile());
-
-		CONFIG.load();
+		CONFIG = Configuration.toml(new File(event.getModConfigurationDirectory(), Reference.MOD_ID + ".toml"));
+
+		PROXY.initOptions();
+		Sandstone.preInit();
 		PROXY.preInit();
-		CONFIG.save();
 	}
 
 	@EventHandler
-	public void load(FMLInitializationEvent event) {
-		Modstats.instance().getReporter().registerMod(this);
+	public void init(FMLInitializationEvent event) {
+		// Modstats.instance().getReporter().registerMod(this);
 
 		PROXY.init();
 		MinecraftForge.EVENT_BUS.register(this);
 	}
 
 	@EventHandler
-	public void modsLoaded(FMLPostInitializationEvent event) {
-		LogHelper.log(Level.INFO, "Loaded successfully!");
+	public void postInit(FMLPostInitializationEvent event) {
+		LOGGER.log(Level.INFO, "Loaded successfully!");
         if (event.getSide() == Side.CLIENT && Loader.isModLoaded("NotEnoughItems")) {
-        	LogHelper.log(Level.INFO, "Hey NEI! I got a plugin for you! (hopefully in the near future).");
+            LOGGER.log(Level.INFO, "Hey NEI! I got a plugin for you! (hopefully in the near future).");
         }
 	}
 
 	@EventHandler
 	public void onMessage(IMCEvent event) {
 		for (IMCMessage message : event.getMessages()) {
 			if (message.key.equals("DestructionCatalyst")) {
-				LogHelper.log(Level.INFO, "[IMC] Added block " + message.getStringValue() + " from " + message.getSender() + " was added to the Destruction Catalyst's registry.");
+                LOGGER.log(Level.INFO, "[IMC] Added block " + message.getStringValue() + " from " + message.getSender() + " was added to the Destruction Catalyst's registry.");
 				ItemDestructionCatalyst.ids.add(message.getStringValue());
 			} else if (message.key.equals("Alkahest")) {
 				NBTTagCompound tag = message.getNBTValue();
@@ -82,9 +88,9 @@ public void onMessage(IMCEvent event) {
 						Alkahestry.addKey(new AlkahestRecipe(tag.getString("dictionaryName"), tag.getInteger("yield"), tag.getInteger("cost")));
 					else
 						Alkahestry.addKey(new AlkahestRecipe(ItemStack.loadItemStackFromNBT(tag.getCompoundTag("item")), tag.getInteger("yield"), tag.getInteger("cost")));
-					LogHelper.log(Level.INFO, "[IMC] Added AlkahestRecipe ID: " + Item.itemRegistry.getNameForObject(ItemStack.loadItemStackFromNBT(tag.getCompoundTag("item"))) + " from " + message.getSender() + " to registry.");
+                    LOGGER.log(Level.INFO, "[IMC] Added AlkahestRecipe ID: " + Item.itemRegistry.getNameForObject(ItemStack.loadItemStackFromNBT(tag.getCompoundTag("item"))) + " from " + message.getSender() + " to registry.");
 				} else {
-					LogHelper.log(Level.WARN, "[IMC] Invalid AlkahestRecipe from " + message.getSender() + "! Please contact the mod author if you see this error occurring.");
+                    LOGGER.log(Level.WARN, "[IMC] Invalid AlkahestRecipe from " + message.getSender() + "! Please contact the mod author if you see this error occurring.");
 				}
 			}
 		}

src/main/java/xreliquary/blocks/BlockAlkahestryAltar.java

@@ -14,23 +14,23 @@
 import net.minecraft.world.World;
 import xreliquary.Reliquary;
 import xreliquary.blocks.tile.TileEntityAltar;
-import xreliquary.init.ContentHandler;
-import xreliquary.init.XRInit;
+import lib.enderwizards.sandstone.init.ContentHandler;
+import lib.enderwizards.sandstone.init.ContentInit;
 import xreliquary.lib.Names;
 import xreliquary.lib.Reference;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockAlkahestryAltar extends BlockContainer {
 
-    @XRInit
+    @ContentInit
     static public class BlockActiveAlkahestryAltar extends BlockAlkahestryAltar {
         public BlockActiveAlkahestryAltar() {
             super(true);
         }
     }
 
-    @XRInit
+    @ContentInit
     static public class BlockIdleAlkahestryAltar extends BlockAlkahestryAltar {
         public BlockIdleAlkahestryAltar() {
             super(false);

src/main/java/xreliquary/blocks/BlockApothecaryCauldron.java

@@ -22,16 +22,16 @@
 import xreliquary.Reliquary;
 import xreliquary.blocks.tile.TileEntityCauldron;
 import xreliquary.client.render.RenderApothecaryCauldron;
-import xreliquary.init.ContentHandler;
-import xreliquary.init.XRInit;
-import xreliquary.items.block.ItemBlockBase;
+import lib.enderwizards.sandstone.init.ContentHandler;
+import lib.enderwizards.sandstone.init.ContentInit;
+import lib.enderwizards.sandstone.items.block.ItemBlockBase;
 import xreliquary.lib.Names;
 import xreliquary.lib.Reference;
 
 import java.util.List;
 import java.util.Random;
 
-@XRInit(itemBlock = ItemBlockBase.class)
+@ContentInit(itemBlock = ItemBlockBase.class)
 public class BlockApothecaryCauldron extends BlockContainer {
 
 	public BlockApothecaryCauldron() {
@@ -92,9 +92,8 @@ public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAligne
 
     //called by the renderer to get the texture in a static method.
     @SideOnly(Side.CLIENT)
-    public static IIcon getCauldronIcon(String textureName)
-    {
-        BlockApothecaryCauldron cauldronStatic = (BlockApothecaryCauldron)ContentHandler.getBlock(Names.apothecary_cauldron);
+    public static IIcon getCauldronIcon(String textureName) {
+        BlockApothecaryCauldron cauldronStatic = (BlockApothecaryCauldron) ContentHandler.getBlock(Names.apothecary_cauldron);
         return textureName.equals("inner") ? cauldronStatic.innerTexture : (textureName.equals("bottom") ? cauldronStatic.bottomTexture : textureName.equals("inside") ? cauldronStatic.insideTexture : null);
     }
 

src/main/java/xreliquary/blocks/BlockApothecaryMortar.java

@@ -6,34 +6,26 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import xreliquary.Reliquary;
-import xreliquary.blocks.tile.TileEntityCauldron;
 import xreliquary.blocks.tile.TileEntityMortar;
-import xreliquary.client.render.RenderApothecaryCauldron;
-import xreliquary.client.render.RenderApothecaryMortar;
-import xreliquary.init.ContentHandler;
-import xreliquary.init.XRInit;
-import xreliquary.items.block.ItemBlockBase;
+import lib.enderwizards.sandstone.init.ContentHandler;
+import lib.enderwizards.sandstone.init.ContentInit;
+import lib.enderwizards.sandstone.items.block.ItemBlockBase;
 import xreliquary.lib.Names;
 import xreliquary.lib.Reference;
 
 import java.util.List;
 import java.util.Random;
 
-@XRInit(itemBlock = ItemBlockBase.class)
+@ContentInit(itemBlock = ItemBlockBase.class)
 public class BlockApothecaryMortar extends BlockContainer {
 
 	public BlockApothecaryMortar() {

src/main/java/xreliquary/blocks/BlockFertileLilypad.java

@@ -6,9 +6,9 @@
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import xreliquary.init.XRInit;
+import lib.enderwizards.sandstone.init.ContentInit;
 import xreliquary.items.block.ItemFertileLilypad;
-import xreliquary.util.ObjectUtils;
+import lib.enderwizards.sandstone.util.ContentHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFlower;
 import net.minecraft.block.material.Material;
@@ -26,7 +26,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@XRInit(itemBlock = ItemFertileLilypad.class)
+@ContentInit(itemBlock = ItemFertileLilypad.class)
 public class BlockFertileLilypad extends BlockFlower {
 
 	public BlockFertileLilypad() {
@@ -72,7 +72,7 @@ public void growCropsNearby(World world, int xO, int yO, int zO) {
 					int z = zO + zD;
 					Block block = world.getBlock(x, y, z);
 
-					if (block != null && Block.blockRegistry.getNameForObject(block).equals(ObjectUtils.getBlockIdentifier(block))) {
+					if (block != null && Block.blockRegistry.getNameForObject(block).equals(ContentHelper.getIndent(block))) {
 						continue;
 					}
 
@@ -104,7 +104,7 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2,
 
 	@Override
 	protected boolean canPlaceBlockOn(Block block) {
-		return block == null ? false : ObjectUtils.areBlocksEqual(block, Blocks.water);
+		return block == null ? false : ContentHelper.areBlocksEqual(block, Blocks.water);
 	}
 
 	@Override

src/main/java/xreliquary/blocks/BlockInterdictionTorch.java

@@ -4,24 +4,22 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockTorch;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.boss.IBossDisplayData;
-import net.minecraft.entity.monster.EntityMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import xreliquary.Reliquary;
-import xreliquary.init.XRInit;
-import xreliquary.items.block.ItemBlockBase;
+import lib.enderwizards.sandstone.init.ContentInit;
+import lib.enderwizards.sandstone.items.block.ItemBlockBase;
 import xreliquary.lib.Names;
 import xreliquary.lib.Reference;
 
 import java.util.List;
 import java.util.Random;
 
-@XRInit(itemBlock = ItemBlockBase.class)
+@ContentInit(itemBlock = ItemBlockBase.class)
 public class BlockInterdictionTorch extends BlockTorch {
 
     public BlockInterdictionTorch() {

src/main/java/xreliquary/blocks/BlockWraithNode.java

@@ -5,13 +5,13 @@
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import xreliquary.Reliquary;
-import xreliquary.init.XRInit;
+import lib.enderwizards.sandstone.init.ContentInit;
 import xreliquary.lib.Names;
 import xreliquary.lib.Reference;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@XRInit
+@ContentInit
 public class BlockWraithNode extends Block {
 
     public IIcon topIcon;

src/main/java/xreliquary/blocks/tile/TileEntityAltar.java

@@ -1,11 +1,11 @@
 package xreliquary.blocks.tile;
 
+import lib.enderwizards.sandstone.blocks.tile.TileEntityBase;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import xreliquary.blocks.BlockAlkahestryAltar;
 
-public class TileEntityAltar extends TileEntity {
+public class TileEntityAltar extends TileEntityBase {
 	private int cycleTime;
 	private boolean isActive;
 	private int redstoneCount;

src/main/java/xreliquary/blocks/tile/TileEntityCauldron.java

@@ -1,9 +1,9 @@
 package xreliquary.blocks.tile;
 
+import lib.enderwizards.sandstone.blocks.tile.TileEntityBase;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 
-public class TileEntityCauldron extends TileEntity {
+public class TileEntityCauldron extends TileEntityBase {
 
 	public TileEntityCauldron() {
 		//TODO initialization stuff, as needed.