The Great Refractor!

src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java

@@ -1,6 +1,6 @@
 package info.jbcs.minecraft.chisel;
 
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 
 import java.util.HashMap;
 
@@ -26,7 +26,7 @@ public class BlockNameConversion
                     return namingConversion.get(oldname);
                 case 1: // simple lower case
                     return oldname.toLowerCase();
-                case 2: // rename "marbleSlab" -> "marble_slab", "blockRedstone" -> "redstone_block"
+                case 2: // rename "marbleSlab" -> "marble_slab", "redstone" -> "redstone_block"
                     newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase();
                     if (newname.startsWith("block_"))
                     {
@@ -44,8 +44,8 @@ public class BlockNameConversion
                         newname = newname.replaceFirst("wood_([a-z_]+)", "$1_planks");
                     }
                     return newname;
-                case (MAX - 1): // ALWAYS last: rename "blockYxx" -> "yxx" (e.g. "blockDirt" -> "dirt").
-                                // This can be dangerous in cases like "blockCarpet" (a block) -> "carpet" (NO block)
+                case (MAX - 1): // ALWAYS last: rename "blockYxx" -> "yxx" (e.g. "dirt" -> "dirt").
+                                // This can be dangerous in cases like "carpet" (a block) -> "carpet" (NO block)
                     return oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase().replaceFirst("block_", "");
                 default:
                     throw new IndexOutOfBoundsException("conversion got invalid parameter step=" + step);
@@ -66,12 +66,12 @@ public class BlockNameConversion
         namingConversion.put("stoneMoss", "mossy_cobblestone");
         namingConversion.put("stoneBrick", "stonebrick");
         namingConversion.put("fenceIron", "iron_bars");
-        namingConversion.put("blockFft", "fantasyblock");
-        namingConversion.put("blockCarpetFloor", "carpet");
-        namingConversion.put("blockTemple", "templeblock");
-        namingConversion.put("blockTempleMossy", "mossy_templeblock");
-        namingConversion.put("blockFactory", "factoryblock");
-        namingConversion.put("blockLaboratory", "laboratoryblock");
+        namingConversion.put("fantasy", "fantasyblock");
+        namingConversion.put("carpetFloor", "carpet");
+        namingConversion.put("temple", "templeblock");
+        namingConversion.put("templeMossy", "mossy_templeblock");
+        namingConversion.put("factory", "factoryblock");
+        namingConversion.put("laboratory", "laboratoryblock");
         // "LightGray" is unfortunately converted to "light_gray"
         namingConversion.put("stainedGlassLightGray", "stained_glass_lightgray");
         namingConversion.put("stainedGlassPaneLightGray", "stained_glass_pane_lightgray");

src/main/java/info/jbcs/minecraft/chisel/Chisel.java

@@ -1,28 +1,26 @@
 package info.jbcs.minecraft.chisel;
 
-import info.jbcs.minecraft.chisel.block.BlockAutoChisel;
 import info.jbcs.minecraft.chisel.block.BlockCarvable;
 import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
 import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel;
 import info.jbcs.minecraft.chisel.client.gui.GuiChisel;
-import info.jbcs.minecraft.chisel.entity.EntityBallOMoss;
-import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle;
-import info.jbcs.minecraft.chisel.entity.EntitySmashingRock;
+import info.jbcs.minecraft.chisel.compat.Compatibility;
+import info.jbcs.minecraft.chisel.compat.FMPIntegration;
+import info.jbcs.minecraft.chisel.compat.ModIntegration;
+import info.jbcs.minecraft.chisel.init.ModBlocks;
+import info.jbcs.minecraft.chisel.init.ModItems;
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel;
 import info.jbcs.minecraft.chisel.inventory.ContainerChisel;
 import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection;
-import info.jbcs.minecraft.chisel.item.ItemBallOMoss;
-import info.jbcs.minecraft.chisel.item.ItemChisel;
-import info.jbcs.minecraft.chisel.item.ItemCloudInABottle;
-import info.jbcs.minecraft.chisel.item.ItemSmashingRock;
+import info.jbcs.minecraft.chisel.proxy.CommonProxy;
 import info.jbcs.minecraft.chisel.world.GeneratorLimestone;
 import info.jbcs.minecraft.chisel.world.GeneratorMarble;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 
 import java.io.File;
 
 import net.minecraft.block.Block;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
@@ -45,32 +43,23 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.Type;
 
 
-@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = "@MOD_VERSION@", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory"/*, dependencies = "after:ForgeMicroblock;"*/)
+@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = "@MOD_VERSION@", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory",  dependencies = "after:ForgeMultipart;")
 public class Chisel
 {
     public static final String MOD_ID = "chisel";
     public static final String MOD_NAME = "Chisel";
 
-    public static ItemChisel chisel;
-    //	public static ItemChisel needle;
-    public static ItemCloudInABottle itemCloudInABottle;
-    public static ItemBallOMoss itemBallOMoss;
-    public static ItemSmashingRock smashingRock;
-
-    public static CreativeTabs tabChisel;
-
     public static boolean multipartLoaded = false;
 
     public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f);
     public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID+":step.templeblock", 1.0f, 1.0f);
     public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f);
 
-    public static Block autoChisel;
+
 
     public static int RenderEldritchId;
     public static int RenderCTMId;
@@ -79,7 +68,7 @@ public class Chisel
     @Instance(MOD_ID)
     public static Chisel instance;
 
-    @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.CommonProxy")
+    @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.proxy.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.proxy.CommonProxy")
     public static CommonProxy proxy;
 
     @EventHandler
@@ -132,45 +121,9 @@ public class Chisel
         Configurations.config.load();
         Configurations.refreshConfig();
 
-        tabChisel = new CreativeTabs("tabChisel")
-        {
-            @Override
-            public Item getTabIconItem()
-            {
-                return chisel;
-            }
-        };
-
-        chisel = (ItemChisel) new ItemChisel().setTextureName("chisel:chisel").setCreativeTab(CreativeTabs.tabTools);
-        GameRegistry.registerItem(chisel, "chisel");
-
-        if(Configurations.featureEnabled("autoChisel")){
-            autoChisel = new BlockAutoChisel().setBlockTextureName("Chisel:autoChisel").setCreativeTab(CreativeTabs.tabTools);
-            GameRegistry.registerBlock(autoChisel, autoChisel.getUnlocalizedName());
-            proxy.registerTileEntities();
-        }
-
-        if(Configurations.featureEnabled("cloud"))
-        {
-            itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle").setCreativeTab(CreativeTabs.tabTools);
-            EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, this, 40, 1, true);
-            GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle");
-        }
-
-        if(Configurations.featureEnabled("ballOfMoss"))
-        {
-            itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(CreativeTabs.tabTools);
-            EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, this, 40, 1, true);
-            GameRegistry.registerItem(itemBallOMoss, "ballomoss");
-        }
-
-        if(Configurations.featureEnabled("smashingRock"))
-        {
-            smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(CreativeTabs.tabTools);
-            EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, this, 40, 1, true);
-            GameRegistry.registerItem(smashingRock, "smashingrock");
-        }
-        ChiselBlocks.load();
+        ModItems.load();
+        ModTabs.load();
+        ModBlocks.load();
         proxy.preInit();
     }
 
@@ -213,8 +166,12 @@ public class Chisel
         });
 
 
-        GameRegistry.registerWorldGenerator(new GeneratorMarble(ChiselBlocks.blockMarble, 32, Configurations.marbleAmount), 1000);
-        GameRegistry.registerWorldGenerator(new GeneratorLimestone(ChiselBlocks.blockLimestone, 32, Configurations.limestoneAmount), 1000);
+        GameRegistry.registerWorldGenerator(new GeneratorMarble(ModBlocks.marble, 32, Configurations.marbleAmount), 1000);
+        GameRegistry.registerWorldGenerator(new GeneratorLimestone(ModBlocks.limestone, 32, Configurations.limestoneAmount), 1000);
+
+        ModIntegration.addMod(FMPIntegration.class);
+
+        ModIntegration.init();
 
         proxy.init();
         MinecraftForge.EVENT_BUS.register(this);
@@ -227,6 +184,7 @@ public class Chisel
     @EventHandler
     public void postInit(FMLPostInitializationEvent event)
     {
+        ModIntegration.postInit();
         Compatibility.init(event);
     }
 

src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java

@@ -5,6 +5,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import info.jbcs.minecraft.chisel.api.ChiselMode;
 import info.jbcs.minecraft.chisel.carving.CarvingVariation;
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
+import info.jbcs.minecraft.chisel.init.ModBlocks;
+import info.jbcs.minecraft.chisel.init.ModItems;
 import info.jbcs.minecraft.chisel.item.ItemChisel;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -33,7 +35,7 @@ public class ChiselLeftClick
         if(!Configurations.enableChiseling) return;
         EntityPlayer player = event.entityPlayer;
         ItemStack stack = player.getHeldItem();
-        if(stack == null || stack.getItem() != Chisel.chisel) return;
+        if(stack == null || stack.getItem() != ModItems.chisel) return;
 
         World world = event.world;
         int x = event.x;
@@ -94,9 +96,9 @@ public class ChiselLeftClick
         /* special case: stone can be carved to cobble and bricks */
         if(Configurations.chiselStoneToCobbleBricks)
         {
-            if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ChiselBlocks.blockCobblestone))
+            if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ModBlocks.cobblestone))
                 match = true;
-            if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ChiselBlocks.stoneBrick))
+            if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ModBlocks.stoneBrick))
                 match = true;
         }
         if(!match)
@@ -152,7 +154,7 @@ public class ChiselLeftClick
         if(!Configurations.enableChiseling) return;
         EntityPlayer player = event.getPlayer();
         ItemStack stack = player.getHeldItem();
-        if(stack == null || stack.getItem() != Chisel.chisel) return;
+        if(stack == null || stack.getItem() != ModItems.chisel) return;
 
         event.setCanceled(true);
     }

src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java

@@ -97,7 +97,7 @@ public class ChiselModCompatibility
 
     public void postInit(FMLPostInitializationEvent event)
     {
-        new ClassBlockCompat("shukaro.artifice.ArtificeBlocks", "blockMarble")
+        new ClassBlockCompat("shukaro.artifice.ArtificeBlocks", "marble")
         {
             @Override
             void action()

src/main/java/info/jbcs/minecraft/chisel/Crafting.java

@@ -1,6 +1,8 @@
 package info.jbcs.minecraft.chisel;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import info.jbcs.minecraft.chisel.init.ModBlocks;
+import info.jbcs.minecraft.chisel.init.ModItems;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -19,57 +21,57 @@ public class Crafting
         Block concreteRecipeBlock = Block.getBlockFromName(Configurations.config.get("tweaks", "concrete recipe block", "gravel", "Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)").getString());
         if(concreteRecipeBlock == null) concreteRecipeBlock = Blocks.gravel;
 
-        FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ChiselBlocks.blockConcrete), 0.1F);
+        FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ModBlocks.concrete), 0.1F);
 
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockSandstoneScribbles, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 8),});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.sandstoneScribbles, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 8),});
         for(int meta = 0; meta < 16; meta++)
         {
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarbleSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ChiselBlocks.blockMarble, 1, meta)});
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLimestoneSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ChiselBlocks.blockLimestone, 1, meta)});
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarblePillarSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ChiselBlocks.blockMarblePillar, 1, meta)});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.marbleSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.marble, 1, meta)});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.limestoneSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.limestone, 1, meta)});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillarSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.marblePillar, 1, meta)});
 
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarblePillar, 6), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.blockMarble, 1, meta),});
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarble, 4), new Object[]{"XX", "XX", 'X', new ItemStack(ChiselBlocks.blockMarblePillar, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillar, 6), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ModBlocks.marble, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.marble, 4), new Object[]{"XX", "XX", 'X', new ItemStack(ModBlocks.marblePillar, 1, meta),});
 
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockIcePillar, 6, 1), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.blockIce, 1, meta),});
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockIce, 4, 1), new Object[]{"XX", "XX", 'X', new ItemStack(ChiselBlocks.blockIcePillar, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.icePillar, 6, 1), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ModBlocks.ice, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.ice, 4, 1), new Object[]{"XX", "XX", 'X', new ItemStack(ModBlocks.icePillar, 1, meta),});
 
-            GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstoneScribbles, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstoneScribbles, 1, meta),});
 
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockCarpet, 8, meta), new Object[]{"YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta),});
-            GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockCarpetFloor, 3, meta), new Object[]{"XX", 'X', new ItemStack(ChiselBlocks.blockCarpet, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.carpet, 8, meta), new Object[]{"YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta),});
+            GameRegistry.addRecipe(new ItemStack(ModBlocks.carpetFloor, 3, meta), new Object[]{"XX", 'X', new ItemStack(ModBlocks.carpet, 1, meta),});
         }
 
         // The following recipe is due to bugs with Chisel 1.5.1 to 1.5.6a
-        GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 0),});
+        GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 0),});
 
         // The following recipe is due to bug with Chisel 1.5.6b
-        GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 1),});
+        GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 1),});
 
 
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockHolystone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1)});
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLavastone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)});
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFft, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)});
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTemple, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4)});
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFactory, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.holystone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.lavastone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.fantasy, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.tyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.temple, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.factory, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)});
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.blockRoadLine, 8, 0), new Object[]{"wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.roadLine, 8, 0), new Object[]{"wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone}));
 
         if(Configurations.chiselRecipe)
         {
-            GameRegistry.addRecipe(new ItemStack(Chisel.chisel, 1), new Object[]{" YY", " YY", "X  ", 'X', Items.stick, 'Y', Items.iron_ingot});
+            GameRegistry.addRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" YY", " YY", "X  ", 'X', Items.stick, 'Y', Items.iron_ingot});
         } else
         {
-            GameRegistry.addRecipe(new ItemStack(Chisel.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot});
+            GameRegistry.addRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot});
         }
 
         if(Configurations.featureEnabled("ballOfMoss"))
-            GameRegistry.addRecipe(new ItemStack(Chisel.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick});
+            GameRegistry.addRecipe(new ItemStack(ModItems.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick});
         if(Configurations.featureEnabled("cloud"))
-            GameRegistry.addRecipe(new ItemStack(Chisel.itemCloudInABottle, 1), new Object[]{"X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz});
+            GameRegistry.addRecipe(new ItemStack(ModItems.itemCloudInABottle, 1), new Object[]{"X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz});
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.blockPaperwall, 8), new Object[]{"ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood"}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.paperWall, 8), new Object[]{"ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood"}));
 
         String[] sGNames = new String[]{
                 "White", "Orange", "Magenta", "Light Blue",
@@ -82,10 +84,10 @@ public class Crafting
         {
             OreDictionary.registerOre("stainedClay" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.stained_hardened_clay, 1, i));
             OreDictionary.registerOre("blockWool" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, i));
-            GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.blockWoolenClay, 2, i), new Object[]{"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")}));
+            GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.woolenClay, 2, i), new Object[]{"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")}));
         }
 
-        GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLaboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)});
+        GameRegistry.addRecipe(new ItemStack(ModBlocks.laboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)});
 
     }
 }

src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java

@@ -6,6 +6,7 @@ import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -30,7 +31,7 @@ public class BlockCarvable extends Block implements ICarvable
     {
         super(m);
         carverHelper = new CarvableHelper();
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     public BlockCarvable setStained(boolean a)

src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java

@@ -6,6 +6,7 @@ import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.BlockGlass;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,7 +26,7 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable
         super(Material.glass, false);
 
         carverHelper = new CarvableHelper();
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     public BlockCarvableGlass setStained(boolean a)

src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java

@@ -7,6 +7,7 @@ import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
 import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer;
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.BlockPane;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,7 +28,7 @@ public class BlockCarvablePane extends BlockPane implements ICarvable
 
         carverHelper = new CarvableHelper();
 
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     public BlockCarvablePane setStained(boolean a)

src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.block;
 
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;

src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java

@@ -7,6 +7,7 @@ import info.jbcs.minecraft.chisel.Chisel;
 
 import java.util.List;
 
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.BlockCarpet;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -23,7 +24,7 @@ public class BlockMarbleCarpet extends BlockCarpet implements ICarvable
     {
         carverHelper = new CarvableHelper();
 
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
 

src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java

@@ -8,6 +8,7 @@ import info.jbcs.minecraft.chisel.Chisel;
 import java.util.List;
 import java.util.Random;
 
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -28,7 +29,7 @@ public class BlockMarbleIce extends BlockIce implements ICarvable
     {
         super();
         carverHelper = new CarvableHelper();
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     @Override

src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java

@@ -1,10 +1,10 @@
 package info.jbcs.minecraft.chisel.block;
 
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
-import info.jbcs.minecraft.chisel.ChiselBlocks;
 
 import java.util.Random;
 
+import info.jbcs.minecraft.chisel.init.ModBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
@@ -22,13 +22,13 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs
     @Override
     public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
     {
-        ChiselBlocks.blockIce.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
+        ModBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
     }
 
     @Override
     public int quantityDropped(Random par1Random)
     {
-        return ChiselBlocks.blockIce.quantityDropped(par1Random);
+        return ModBlocks.ice.quantityDropped(par1Random);
     }
 
     @Override
@@ -40,7 +40,7 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs
     @Override
     public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
     {
-        ChiselBlocks.blockIce.updateTick(par1World, par2, par3, par4, par5Random);
+        ModBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random);
     }
 
     @Override

src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java

@@ -8,6 +8,7 @@ import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer;
 
 import java.util.List;
 
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -29,7 +30,7 @@ public class BlockMarbleStairs extends BlockStairs implements ICarvable
         super(block, meta);
 
         this.useNeighborBrightness = true;
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
         carverHelper = helper;
         blockMeta = meta;
     }

src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java

@@ -7,6 +7,7 @@ import info.jbcs.minecraft.chisel.Chisel;
 
 import java.util.List;
 
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -23,7 +24,7 @@ public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvabl
 
         carverHelper = new CarvableHelper();
 
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     @Override

src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java

@@ -5,6 +5,7 @@ import info.jbcs.minecraft.chisel.Chisel;
 
 import java.util.List;
 
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockWall;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,7 +23,7 @@ public class BlockMarbleWall extends BlockWall
 
         carverHelper = new CarvableHelper();
 
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     @Override

src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java

@@ -2,6 +2,7 @@ package info.jbcs.minecraft.chisel.block;
 
 import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer;
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -23,7 +24,7 @@ public class BlockRoadLine extends Block
         this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f);
 //        this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
 
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
     @Override

src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java

@@ -5,6 +5,7 @@ import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer;
 
 import java.util.List;
 
+import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -57,7 +58,7 @@ public class BlockSnakestone extends Block
         setHardness(1.5F);
         setResistance(10.0F);
         setStepSound(Block.soundTypeStone);
-        setCreativeTab(Chisel.tabChisel);
+        setCreativeTab(ModTabs.tabChiselBlocks);
         flipTopTextures = false;
 
         this.iconPrefix = iconPrefix;

src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java

@@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.Side;
 import info.jbcs.minecraft.chisel.Configurations;
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
 import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java

@@ -8,7 +8,7 @@ import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM
 import info.jbcs.minecraft.chisel.client.render.CTM;
 import info.jbcs.minecraft.chisel.client.render.TextureSubmap;
 import info.jbcs.minecraft.chisel.item.ItemCarvable;
-import info.jbcs.minecraft.utilities.GeneralClient;
+import info.jbcs.minecraft.chisel.utils.GeneralClient;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPane;
 import net.minecraft.block.material.Material;

src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java

@@ -4,10 +4,10 @@ import info.jbcs.minecraft.chisel.Configurations;
 import info.jbcs.minecraft.chisel.block.BlockHolystone;
 import info.jbcs.minecraft.chisel.block.BlockLavastone;
 import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
-import info.jbcs.minecraft.chisel.entity.EntityBallOMossFX;
-import info.jbcs.minecraft.chisel.entity.EntityHolystoneFX;
-import info.jbcs.minecraft.chisel.entity.EntitySnakestoneObsidianFX;
-import info.jbcs.minecraft.utilities.GeneralClient;
+import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX;
+import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX;
+import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX;
+import info.jbcs.minecraft.chisel.utils.GeneralClient;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;

src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java

@@ -2,13 +2,11 @@ package info.jbcs.minecraft.chisel.client.gui;
 
 import info.jbcs.minecraft.chisel.inventory.ContainerChisel;
 import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection;
-import info.jbcs.minecraft.utilities.GeneralClient;
-import net.minecraft.client.gui.GuiButton;
+import info.jbcs.minecraft.chisel.utils.GeneralClient;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
 
 import org.lwjgl.opengl.GL11;
 

src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.gui;
 
-import info.jbcs.minecraft.utilities.DummyContainer;
-import info.jbcs.minecraft.utilities.GeneralClient;
+import info.jbcs.minecraft.chisel.utils.DummyContainer;
+import info.jbcs.minecraft.chisel.utils.GeneralClient;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;

src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java

@@ -1,6 +1,6 @@
 package info.jbcs.minecraft.chisel.client.gui;
 
-import info.jbcs.minecraft.utilities.GeneralClient;
+import info.jbcs.minecraft.chisel.utils.GeneralClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java

@@ -4,7 +4,7 @@ import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
 import info.jbcs.minecraft.chisel.Chisel;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
 import info.jbcs.minecraft.chisel.Chisel;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java

@@ -1,6 +1,6 @@
 package info.jbcs.minecraft.chisel.client.render;
 
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPane;
 import net.minecraft.client.renderer.EntityRenderer;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java

@@ -2,7 +2,7 @@ package info.jbcs.minecraft.chisel.client.render;
 
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.block.BlockMarblePillar;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
 import info.jbcs.minecraft.chisel.block.BlockMarbleStairs;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java

@@ -1,6 +1,6 @@
 package info.jbcs.minecraft.chisel.client.render;
 
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
 import info.jbcs.minecraft.chisel.block.BlockRoadLine;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.RenderBlocks;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
 import info.jbcs.minecraft.chisel.block.BlockSnakestone;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
-import info.jbcs.minecraft.chisel.ChiselBlocks;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.init.ModBlocks;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 
 import java.util.Random;
 
@@ -66,22 +66,14 @@ public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
     {
-        int meta = world.getBlockMetadata(x, y, z);
-
         renderer.renderStandardBlock(block, x, y, z);
 
         Tessellator tessellator = Tessellator.instance;
-        IIcon icon = ChiselBlocks.blockSpiketrap.iconSpike;
-//		Icon icon=Chisel.blockSpiketrap.iconBase;
+        IIcon icon = ModBlocks.spikeTrap.iconSpike;
 
-        double h = 0.85;
         double d = 1.5 / 16;
         double r = d / 2;
 
-
-        double tx = x + 0.25;
-        double ty = y + h;
-        double tz = z + 0.25;
         double skew = 0.5;
 
         //       tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));

src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java

@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
 import info.jbcs.minecraft.chisel.block.BlockTexturedOre;
-import info.jbcs.minecraft.utilities.Drawing;
+import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.init.Blocks;

src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java

@@ -1,8 +1,9 @@
-package info.jbcs.minecraft.chisel;
+package info.jbcs.minecraft.chisel.compat;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
+import info.jbcs.minecraft.chisel.ChiselModCompatibility;
 import info.jbcs.minecraft.chisel.carving.Carving;
 
 public class Compatibility

src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java

@@ -0,0 +1,76 @@
+package info.jbcs.minecraft.chisel.compat;
+
+import cpw.mods.fml.common.event.FMLInterModComms;
+import info.jbcs.minecraft.chisel.compat.ModIntegration.IModIntegration;
+import info.jbcs.minecraft.chisel.init.ModBlocks;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+public class FMPIntegration implements IModIntegration{
+    @Override
+    public String getModId(){
+        return "ForgeMultipart";
+    }
+
+    @Override
+    public void onInit(){
+        registerMaterial(ModBlocks.marble);
+        registerMaterial(ModBlocks.marbleSlab);
+        registerMaterial(ModBlocks.marblePillar);
+        registerMaterial(ModBlocks.marblePillarSlab);
+        registerMaterial(ModBlocks.marbleStairs);
+        registerMaterial(ModBlocks.limestone);
+        registerMaterial(ModBlocks.limestoneSlab);
+        registerMaterial(ModBlocks.limestoneStairs);
+        registerMaterial(ModBlocks.cobblestone);
+        registerMaterial(ModBlocks.glass);
+        registerMaterial(ModBlocks.sandstone, 3, 15);
+        registerMaterial(ModBlocks.sandstoneScribbles);
+        registerMaterial(ModBlocks.concrete, 0, 10);
+        registerMaterial(ModBlocks.iron, 1, 15);
+        registerMaterial(ModBlocks.gold, 1, 14);
+        registerMaterial(ModBlocks.diamond, 1, 12);
+        registerMaterial(ModBlocks.lightstone, 1, 15);
+        registerMaterial(ModBlocks.lapis, 1, 8);
+        registerMaterial(ModBlocks.emerald, 1, 11);
+        registerMaterial(ModBlocks.netherBrick, 1, 15);
+        registerMaterial(ModBlocks.netherrack, 1, 14);
+        registerMaterial(ModBlocks.cobblestoneMossy, 1, 15);
+        registerMaterial(ModBlocks.stoneBrick, 4, 15);
+        registerMaterial(ModBlocks.dirt, 0, 12);
+        registerMaterial(ModBlocks.ice, 1, 15);
+        registerMaterial(ModBlocks.icePillar);
+        registerMaterial(ModBlocks.iceStairs);
+        registerMaterial(ModBlocks.obsidian, 1, 15);
+        registerMaterial(ModBlocks.paneIron, 1, 9);
+        registerMaterial(ModBlocks.redstone, 1, 15);
+        registerMaterial(ModBlocks.holystone, 0, 13);
+        registerMaterial(ModBlocks.lavastone, 0, 6);
+        registerMaterial(ModBlocks.fantasy);
+        registerMaterial(ModBlocks.carpet);
+        registerMaterial(ModBlocks.carpetFloor);
+        registerMaterial(ModBlocks.bookshelf, 0, 8);
+        registerMaterial(ModBlocks.tyrian);
+        registerMaterial(ModBlocks.temple);
+        registerMaterial(ModBlocks.templeMossy);
+        registerMaterial(ModBlocks.cloud, 0, 0);
+        registerMaterial(ModBlocks.factory);
+        registerMaterial(ModBlocks.paperWall, 0, 8);
+        registerMaterial(ModBlocks.laboratory);
+    }
+
+    @Override
+    public void onPostInit(){
+
+    }
+
+    private void registerMaterial(Block block){
+        registerMaterial(block, 0, 15);
+    }
+
+    private void registerMaterial(Block block, int minMeta, int maxMeta){
+        for(int c = minMeta; c <= maxMeta; c++){
+            FMLInterModComms.sendMessage(getModId(), "microMaterial", new ItemStack(block, 1, c));
+        }
+    }
+}

src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java

@@ -0,0 +1,49 @@
+package info.jbcs.minecraft.chisel.compat;
+
+import cpw.mods.fml.common.Loader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ModIntegration {
+
+    private static List<IModIntegration> integratedMods = new ArrayList<IModIntegration>();
+
+    public static void addMod(Class<? extends IModIntegration> cls){
+        try{
+            IModIntegration obj = cls.newInstance();
+
+            if(Loader.isModLoaded(obj.getModId())){
+                integratedMods.add(obj);
+            }
+        } catch(Throwable throwable){
+            throwable.printStackTrace();
+        }
+    }
+
+    public static void init(){
+        try{
+            for(IModIntegration integration : integratedMods){
+                integration.onInit();
+            }
+        } catch (Throwable throwable){
+            throwable.printStackTrace();
+        }
+    }
+
+    public static void postInit(){
+        try {
+            for (IModIntegration integration : integratedMods){
+                integration.onPostInit();
+            }
+        } catch (Throwable throwable){
+            throwable.printStackTrace();
+        }
+    }
+
+    static interface IModIntegration{
+        String getModId();
+        void onInit();
+        void onPostInit();
+    }
+}

src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java

@@ -1,9 +1,9 @@
 package info.jbcs.minecraft.chisel.entity;
 
 import info.jbcs.minecraft.chisel.Chisel;
-import info.jbcs.minecraft.chisel.ChiselBlocks;
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.init.ModBlocks;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityThrowable;
@@ -106,12 +106,12 @@ public class EntityBallOMoss extends EntityThrowable
         } else if(block.equals(Blocks.cobblestone_wall) && meta == 0)
         {
             resMeta = 1;
-        } else if(block.equals(ChiselBlocks.blockCobblestone))
+        } else if(block.equals(ModBlocks.cobblestone))
         {
-            resBlock = ChiselBlocks.blockCobblestoneMossy;
-        } else if(block.equals(ChiselBlocks.blockTemple))
+            resBlock = ModBlocks.cobblestoneMossy;
+        } else if(block.equals(ModBlocks.temple))
         {
-            resBlock = ChiselBlocks.blockTempleMossy;
+            resBlock = ModBlocks.templeMossy;
         } else if(block.equals(Blocks.stonebrick))
         {
             resMeta = 1;

src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java

@@ -1,10 +1,8 @@
 package info.jbcs.minecraft.chisel.entity;
 
-import info.jbcs.minecraft.chisel.Chisel;
-import info.jbcs.minecraft.chisel.ChiselBlocks;
-
 import java.util.Random;
 
+import info.jbcs.minecraft.chisel.init.ModBlocks;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.util.MovingObjectPosition;
@@ -109,7 +107,7 @@ public class EntityCloudInABottle extends EntityThrowable
                         {
                             if(world.getBlock(j2, k2, l2).isAir(world, j2, k2, l2) && Math.abs(j2 - x) + Math.abs(k2 - y) + Math.abs(l2 - z) < 4 * 1 + random.nextInt(2))
                             {
-                                world.setBlock(j2, k2, l2, ChiselBlocks.blockCloud);
+                                world.setBlock(j2, k2, l2, ModBlocks.cloud);
                                 count++;
                             }
                         }

src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java

@@ -1,8 +1,6 @@
 package info.jbcs.minecraft.chisel.entity;
 
-import info.jbcs.minecraft.chisel.ChiselBlocks;
-import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityThrowable;

src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java

@@ -1,8 +1,9 @@
-package info.jbcs.minecraft.chisel.entity;
+package info.jbcs.minecraft.chisel.entity.fx;
 
 import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.init.ModItems;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
@@ -107,7 +108,7 @@ public class EntityBallOMossFX extends EntityFX
 
 //		setParticleIcon(block.particles[General.rand.nextInt(block.particles.length)]);
 
-        icon = Chisel.itemBallOMoss.getIconFromDamage(0);
+        icon = ModItems.itemBallOMoss.getIconFromDamage(0);
         float width = 4.0f + General.rand.nextFloat() * 8.0f;
         float uu = General.rand.nextFloat() * (16.0f - width);
         float vv = General.rand.nextFloat() * (16.0f - width);

src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java

@@ -1,7 +1,7 @@
-package info.jbcs.minecraft.chisel.entity;
+package info.jbcs.minecraft.chisel.entity.fx;
 
 import info.jbcs.minecraft.chisel.block.BlockHolystone;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.world.World;

src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java

@@ -1,7 +1,7 @@
-package info.jbcs.minecraft.chisel.entity;
+package info.jbcs.minecraft.chisel.entity.fx;
 
 import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.world.World;

src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java

@@ -0,0 +1,47 @@
+package info.jbcs.minecraft.chisel.init;
+
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import info.jbcs.minecraft.chisel.Chisel;
+import info.jbcs.minecraft.chisel.Configurations;
+import info.jbcs.minecraft.chisel.entity.EntityBallOMoss;
+import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle;
+import info.jbcs.minecraft.chisel.entity.EntitySmashingRock;
+import info.jbcs.minecraft.chisel.item.ItemBallOMoss;
+import info.jbcs.minecraft.chisel.item.ItemChisel;
+import info.jbcs.minecraft.chisel.item.ItemCloudInABottle;
+import info.jbcs.minecraft.chisel.item.ItemSmashingRock;
+import net.minecraft.creativetab.CreativeTabs;
+
+public class ModItems {
+    public static ItemChisel chisel;
+    public static ItemCloudInABottle itemCloudInABottle;
+    public static ItemBallOMoss itemBallOMoss;
+    public static ItemSmashingRock smashingRock;
+
+    public static void load(){
+        chisel = (ItemChisel) new ItemChisel().setTextureName("chisel:chisel").setCreativeTab(CreativeTabs.tabTools);
+        GameRegistry.registerItem(chisel, "chisel");
+
+        if(Configurations.featureEnabled("cloud"))
+        {
+            itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle").setCreativeTab(CreativeTabs.tabTools);
+            EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true);
+            GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle");
+        }
+
+        if(Configurations.featureEnabled("ballOfMoss"))
+        {
+            itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(CreativeTabs.tabTools);
+            EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true);
+            GameRegistry.registerItem(itemBallOMoss, "ballomoss");
+        }
+
+        if(Configurations.featureEnabled("smashingRock"))
+        {
+            smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(CreativeTabs.tabTools);
+            EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true);
+            GameRegistry.registerItem(smashingRock, "smashingrock");
+        }
+    }
+}

src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java

@@ -0,0 +1,28 @@
+package info.jbcs.minecraft.chisel.init;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class ModTabs {
+
+    public static CreativeTabs tabChisel;
+    public static CreativeTabs tabChiselBlocks;
+
+    public static void load(){
+        tabChisel = new CreativeTabs("tabChisel")
+        {
+            @Override
+            public Item getTabIconItem()
+            {
+                return Item.getItemFromBlock(ModBlocks.holystone);
+            }
+        };
+
+        tabChiselBlocks = new CreativeTabs("tabChiselBlocks") {
+            @Override
+            public Item getTabIconItem() {
+                return ModItems.chisel;
+            }
+        };
+    }
+}

src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java

@@ -2,7 +2,7 @@ package info.jbcs.minecraft.chisel.inventory;
 
 import info.jbcs.minecraft.chisel.carving.Carving;
 import info.jbcs.minecraft.chisel.item.ItemChisel;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;

src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java

@@ -1,6 +1,6 @@
 package info.jbcs.minecraft.chisel.inventory;
 
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java

@@ -3,7 +3,7 @@ package info.jbcs.minecraft.chisel.item;
 import info.jbcs.minecraft.chisel.Configurations;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
-import info.jbcs.minecraft.utilities.General;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;

src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java

@@ -1,5 +1,6 @@
-package info.jbcs.minecraft.chisel;
+package info.jbcs.minecraft.chisel.proxy;
 
+import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.entity.EntityBallOMoss;
 import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle;
 import info.jbcs.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer;
@@ -14,6 +15,7 @@ import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer;
 import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer;
 import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer;
 import info.jbcs.minecraft.chisel.client.render.ItemChiselRenderer;
+import info.jbcs.minecraft.chisel.init.ModItems;
 import net.minecraft.client.renderer.entity.RenderSnowball;
 import net.minecraftforge.client.MinecraftForgeClient;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -43,9 +45,9 @@ public class ClientProxy extends CommonProxy
 
         RenderingRegistry.registerBlockHandler(new BlockTexturedOreRenderer());
 
-        RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(Chisel.itemCloudInABottle));
-        RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(Chisel.itemBallOMoss));
+        RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ModItems.itemCloudInABottle));
+        RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ModItems.itemBallOMoss));
 
-        MinecraftForgeClient.registerItemRenderer(Chisel.chisel, renderer);
+        MinecraftForgeClient.registerItemRenderer(ModItems.chisel, renderer);
     }
 }

src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.chisel;
+package info.jbcs.minecraft.chisel.proxy;
 
 import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
 import net.minecraft.tileentity.TileEntity;

src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;

src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;

src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;

src/main/java/info/jbcs/minecraft/chisel/utils/General.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import java.util.HashMap;
 import java.util.Random;

src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import java.util.HashMap;
 import java.util.Random;

src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java

@@ -1,4 +1,4 @@
-package info.jbcs.minecraft.utilities;
+package info.jbcs.minecraft.chisel.utils;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;