june's chisel block additions on an actually working branch this time

src/main/java/team/chisel/Features.java

@@ -206,6 +206,11 @@ void addBlocks() {
             andesite.carverHelper.addVariation("tile.andesite.4.desc", 4, "andesite/andesiteOrnate");
             andesite.carverHelper.addVariation("tile.andesite.5.desc", 5, "andesite/andesitePrism");
             andesite.carverHelper.addVariation("tile.andesite.6.desc", 6, "andesite/andesiteTiles");
+            andesite.carverHelper.addVariation("tile.andesite.7.desc", 7, "andesite/andesiteCobblestone");
+            andesite.carverHelper.addVariation("tile.andesite.8.desc", 8, "andesite/andesiteMossy");
+            andesite.carverHelper.addVariation("tile.andesite.9.desc", 9, "andesite/andesiteModern");
+            andesite.carverHelper.addVariation("tile.andesite.10.desc", 10, "andesite/polished_andesite");
+            andesite.carverHelper.addVariation("tile.andesite.11.desc", 11, "andesite/andesite_weathered");
             andesite.carverHelper.registerAll(andesite, "andesite");
             andesite.carverHelper.registerOre("blockAndesite");
             andesite.carverHelper.registerOre("stoneAndesite");
@@ -456,10 +461,19 @@ void addBlocks() {
             brickCustom.carverHelper.addVariation("tile.brickCustom.1.desc", 1, "brickCustom/large");
             brickCustom.carverHelper.addVariation("tile.brickCustom.2.desc", 2, "brickCustom/mortarless");
             brickCustom.carverHelper.addVariation("tile.brickCustom.3.desc", 3, "brickCustom/varied");
-            // brickCustom.carverHelper.addVariation("tile.brickCustom.4.desc",
-            // 4, "brickCustom/cracked");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.4.desc", 4, "brickCustom/mortar");
             brickCustom.carverHelper.addVariation("tile.brickCustom.5.desc", 5, "brickCustom/aged");
             brickCustom.carverHelper.addVariation("tile.brickCustom.6.desc", 6, "brickCustom/yellow");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.7.desc", 7, "brickCustom/brick_tile");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.8.desc", 8, "brickCustom/brick_panel");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.9.desc", 9, "brickCustom/brown_bricks");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.10.desc", 10, "brickCustom/modern");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.11.desc", 11, "brickCustom/white_bricks");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.12.desc", 12, "brickCustom/black_bricks");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.13.desc", 13, "brickCustom/sooty");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.14.desc", 14, "brickCustom/mossy");
+            brickCustom.carverHelper.addVariation("tile.brickCustom.15.desc", 15, "brickCustom/neutral");
+
             brickCustom.carverHelper.registerAll(brickCustom, "brickCustom");
             Carving.chisel.registerOre("brickCustom", "brickCustom");
         }
@@ -965,6 +979,12 @@ void addBlocks() {
             diorite.carverHelper.addVariation("tile.diorite.4.desc", 4, "diorite/dioriteOrnate");
             diorite.carverHelper.addVariation("tile.diorite.5.desc", 5, "diorite/dioritePrism");
             diorite.carverHelper.addVariation("tile.diorite.6.desc", 6, "diorite/dioriteTiles");
+            diorite.carverHelper.addVariation("tile.diorite.7.desc", 7, "diorite/dioriteCobblestone");
+            diorite.carverHelper.addVariation("tile.diorite.8.desc", 8, "diorite/dioriteMossy");
+            diorite.carverHelper.addVariation("tile.diorite.9.desc", 9, "diorite/dioriteModern");
+            diorite.carverHelper.addVariation("tile.diorite.10.desc", 10, "diorite/polished_diorite");
+            diorite.carverHelper.addVariation("tile.diorite.11.desc", 11, "diorite/diorite_black");
+            diorite.carverHelper.addVariation("tile.diorite.12.desc", 12, "diorite/diorite_hornblende");
             diorite.carverHelper.registerAll(diorite, "diorite");
             diorite.carverHelper.registerOre("blockDiorite");
             diorite.carverHelper.registerOre("stoneDiorite");
@@ -1298,6 +1318,7 @@ void addBlocks() {
                 .setHardness(0.3F)
                 .setStepSound(Block.soundTypeGlass);
             glass2.carverHelper.addVariation("tile.glass2.0.desc", 0, "glass/chrono", 20);
+            glass2.carverHelper.addVariation("tile.glass2.1.desc", 1, "glass/modern_glass", 1);
             glass2.carverHelper.registerBlock(glass2, "glass2");
             glass2.carverHelper.registerVariations("glass");
         }
@@ -1566,6 +1587,11 @@ void addBlocks() {
             granite.carverHelper.addVariation("tile.granite.4.desc", 4, "granite/graniteOrnate");
             granite.carverHelper.addVariation("tile.granite.5.desc", 5, "granite/granitePrism");
             granite.carverHelper.addVariation("tile.granite.6.desc", 6, "granite/graniteTiles");
+            granite.carverHelper.addVariation("tile.granite.7.desc", 7, "granite/graniteCobblestone");
+            granite.carverHelper.addVariation("tile.granite.8.desc", 8, "granite/graniteMossy");
+            granite.carverHelper.addVariation("tile.granite.9.desc", 9, "granite/graniteModern");
+            granite.carverHelper.addVariation("tile.granite.10.desc", 10, "granite/graniteModernPolished");
+            granite.carverHelper.addVariation("tile.granite.11.desc", 11, "granite/graniteMineralSand");
             granite.carverHelper.registerAll(granite, "granite");
             granite.carverHelper.registerOre("blockGranite");
             granite.carverHelper.registerOre("stoneGranite");
@@ -4601,6 +4627,49 @@ void addRecipes() {
                 new ItemStack(Blocks.dirt, 1));
         }
     },
+    MOSS_CARPET {
+
+        @Override
+        void addBlocks() {
+            BlockCarvableCarpet moss_carpet = (BlockCarvableCarpet) new BlockCarvableCarpet(Material.grass)
+                .setCreativeTab(ChiselTabs.tabOtherChiselBlocks)
+                .setHardness(1.0F)
+                .setResistance(1.0F);
+
+            moss_carpet.carverHelper.addVariation("tile.moss.0.desc", 0, "moss/moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.1.desc", 1, "moss/pale_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.2.desc", 2, "moss/dark_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.3.desc", 3, "moss/dry_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.4.desc", 4, "moss/golden_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.5.desc", 5, "moss/infused_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.6.desc", 6, "moss/mutated_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.7.desc", 7, "moss/scorched_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.8.desc", 8, "moss/vivid_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.9.desc", 9, "moss/peat_moss");
+            moss_carpet.carverHelper.addVariation("tile.moss.10.desc", 10, "moss/pink_sphagnum_moss");
+            if (!Configurations.allowChiselCrossColors) {
+                moss_carpet.carverHelper.forbidChiseling = true;
+            }
+            moss_carpet.carverHelper.registerAll(moss_carpet, "moss_carpet");
+            OreDictionary.registerOre("blockMossCarpet", moss_carpet);
+        }
+
+        @Override
+        void addRecipes() {
+            GameRegistry.addRecipe(
+                new ItemStack(moss_carpet, 8, meta),
+                "YY ",
+                "   ",
+                "   ",
+                'Y',
+                new ItemStack(ChiselBlocks.moss, 1, meta));
+        }
+
+        @Override
+        boolean needsMetaRecipes() {
+            return true;
+        }
+    },
     ELECTRUM {
 
         @Override
@@ -4867,6 +4936,82 @@ void addBlocks() {
             cobalt.carverHelper.registerAll(cobalt, "cobaltblock");
             Carving.chisel.registerOre("cobaltblock", "blockCobalt");
         }
+    },
+
+    CORAL {
+
+        @Override
+        void addBlocks() {
+            BlockCarvable coral = (BlockCarvable) new BlockCarvable(Material.ground).setStepSound(Block.soundTypeStone)
+                .setCreativeTab(ChiselTabs.tabStoneChiselBlocks)
+                .setHardness(2F)
+                .setResistance(4F);
+            coral.carverHelper.addVariation("tile.coral.0.desc", 0, "coral/brain_coral", 0);
+            coral.carverHelper.addVariation("tile.coral.1.desc", 1, "coral/bubble_coral", 1);
+            coral.carverHelper.addVariation("tile.coral.2.desc", 2, "coral/fire_coral", 2);
+            coral.carverHelper.addVariation("tile.coral.3.desc", 3, "coral/horn_coral", 3);
+            coral.carverHelper.addVariation("tile.coral.4.desc", 4, "coral/tube_coral", 4);
+            coral.carverHelper.addVariation("tile.coral.5.desc", 5, "coral/dead_brain_coral", 5);
+            coral.carverHelper.addVariation("tile.coral.6.desc", 6, "coral/dead_bubble_coral", 6);
+            coral.carverHelper.addVariation("tile.coral.7.desc", 7, "coral/dead_fire_coral", 7);
+            coral.carverHelper.addVariation("tile.coral.8.desc", 8, "coral/dead_horn_coral", 8);
+            coral.carverHelper.addVariation("tile.coral.9.desc", 9, "coral/dead_tube_coral", 9);
+            coral.carverHelper.addVariation("tile.coral.10.desc", 10, "coral/brain_coral_bricks", 10);
+            coral.carverHelper.addVariation("tile.coral.11.desc", 11, "coral/bubble_coral_bricks", 11);
+            coral.carverHelper.addVariation("tile.coral.12.desc", 12, "coral/fire_coral_bricks", 12);
+            coral.carverHelper.addVariation("tile.coral.13.desc", 13, "coral/horn_coral_bricks", 13);
+            coral.carverHelper.addVariation("tile.coral.14.desc", 14, "coral/tube_coral_bricks", 14);
+            coral.carverHelper.addVariation("tile.coral.15.desc", 15, "coral/dead_coral_bricks", 15);
+            coral.carverHelper.registerAll(coral, "coral");
+            Carving.chisel.registerOre("coral", "blockCoral");
+        }
+
+        @Override
+        void addRecipes() {
+            GameRegistry.addRecipe(
+                new ItemStack(coral, 8, 0),
+                "ggg",
+                "gMg",
+                "ggg",
+                'M',
+                new ItemStack(Items.water_bucket, 1),
+                'g',
+                new ItemStack(Items.bone, 1));
+        }
+    },
+
+    MUD {
+
+        @Override
+        void addBlocks() {
+            BlockCarvable mud = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeGrass)
+                .setCreativeTab(ChiselTabs.tabOtherChiselBlocks)
+                .setHardness(1F)
+                .setResistance(1F);
+
+            mud.carverHelper.addVariation("tile.mud.0.desc", 0, "mud/mud");
+            mud.carverHelper.addVariation("tile.mud.1.desc", 1, "mud/loamy_mud");
+            mud.carverHelper.addVariation("tile.mud.2.desc", 2, "mud/marl");
+            mud.carverHelper.addVariation("tile.mud.3.desc", 3, "mud/brown_mud");
+            mud.carverHelper.addVariation("tile.mud.4.desc", 4, "mud/packed_mud");
+            mud.carverHelper.addVariation("tile.mud.5.desc", 5, "mud/rooted_mud");
+            mud.carverHelper.addVariation("tile.mud.6.desc", 6, "mud/mud_bricks");
+
+            mud.carverHelper.registerAll(mud, "mud");
+        }
+
+        @Override
+        void addRecipes() {
+            GameRegistry.addRecipe(
+                new ItemStack(mud, 8, 0),
+                "iii",
+                "ixi",
+                "iii",
+                'x',
+                new ItemStack(Items.water_bucket, 1),
+                'i',
+                new ItemStack(Blocks.dirt, 1));
+        }
     };
 
     private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple",
@@ -4987,17 +5132,11 @@ private Features(String requriedMod, Features parent) {
         this.parent = parent;
     }
 
-    void addBlocks() {
-        ;
-    }
+    void addBlocks() {}
 
-    void addItems() {
-        ;
-    }
+    void addItems() {}
 
-    void addRecipes() {
-        ;
-    }
+    void addRecipes() {}
 
     public boolean enabled() {
         return Configurations.featureEnabled(this) && hasRequiredMod() && hasParentFeature();

src/main/java/team/chisel/init/ChiselBlocks.java

@@ -192,6 +192,8 @@ public final class ChiselBlocks {
     public static final BlockCarvable rpp = null;
     public static final BlockCarvable iridium = null;
     public static final BlockCarvable osmium = null;
+    public static final BlockCarvable coral = null;
+    public static final BlockCarvable mud = null;
 
     private ChiselBlocks() {}
 }

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

@@ -101,6 +101,12 @@ tile.diorite.3.desc=Diorite Bricks
 tile.diorite.4.desc=Ornate Diorite
 tile.diorite.5.desc=Prismatic Diorite
 tile.diorite.6.desc=Diorite Small Tiles
+tile.diorite.7.desc=Cobbled Diorite
+tile.diorite.8.desc=Mossy Diorite
+tile.diorite.9.desc=Modern Diorite
+tile.diorite.10.desc=Modern Polished Diorite
+tile.diorite.11.desc=Biotite-Rich Diorite
+tile.diorite.12.desc=Hornblende-Rich Diorite
 
 #Andesite
 tile.chisel.andesite.name=Andesite
@@ -111,6 +117,11 @@ tile.andesite.3.desc=Andesite Bricks
 tile.andesite.4.desc=Ornate Andesite
 tile.andesite.5.desc=Prismatic Andesite
 tile.andesite.6.desc=Andesite Small Tiles
+tile.andesite.7.desc=Cobbled Andesite
+tile.andesite.8.desc=Mossy Andesite
+tile.andesite.9.desc=Modern Andesite
+tile.andesite.10.desc=Modern Polished Andesite
+tile.andesite.11.desc=Weathered Andesite
 
 #Granite
 tile.chisel.granite.name=Granite
@@ -121,6 +132,11 @@ tile.granite.3.desc=Granite Bricks
 tile.granite.4.desc=Ornate Granite
 tile.granite.5.desc=Prismatic Granite
 tile.granite.6.desc=Granite Small Tiles
+tile.granite.7.desc=Cobbled Granite
+tile.granite.8.desc=Mossy Granite
+tile.granite.9.desc=Modern Granite
+tile.granite.10.desc=Modern Polished Granite
+tile.granite.11.desc=Granitic Mineral Sand
 
 #Auto Chisel
 tile.chisel.autoChisel.name=Auto Chisel
@@ -952,8 +968,18 @@ tile.chisel.brickCustom.name=Brick Block
 tile.brickCustom.1.desc=Large Bricks
 tile.brickCustom.2.desc=Mortarless Bricks
 tile.brickCustom.3.desc=Varied Bricks
+tile.brickCustom.4.desc=Oops! All Mortar!
 tile.brickCustom.5.desc=Aged Bricks
 tile.brickCustom.6.desc=Yellow Bricks
+tile.brickCustom.7.desc=Brick Tile
+tile.brickCustom.8.desc=Brick Panel
+tile.brickCustom.9.desc=Brown Bricks
+tile.brickCustom.10.desc=Modern Bricks
+tile.brickCustom.11.desc=White Bricks
+tile.brickCustom.12.desc=Black Bricks
+tile.brickCustom.13.desc=Sooty Bricks
+tile.brickCustom.14.desc=Mossy Bricks
+tile.brickCustom.15.desc=Neutral Bricks
 
 #Chisel 1
 
@@ -1250,6 +1276,8 @@ tile.glass.15.desc=Modern Iron Fence
 
 tile.chisel.glass2.name=Glass
 tile.glass2.0.desc=Asymmetrical Leaded Glass
+tile.glass2.1.desc=Modern Glass
+tile.glass2.2.desc=Glass (CTM)
 
 #Sandstone
 tile.chisel.sandstone.name=Sandstone
@@ -2729,6 +2757,7 @@ tile.sheetmetal.9.desc=Treading (Rusty)
 
 #Moss
 tile.chisel.moss.name=Moss
+tile.chisel.moss_carpet.name=Moss Carpet
 tile.moss.0.desc=Lush
 tile.moss.1.desc=Pale
 tile.moss.2.desc=Dark
@@ -2772,6 +2801,32 @@ tile.newetalOre.5.desc=Egregious
 tile.newetalOre.6.desc=Scaffolding
 tile.newetalOre.7.desc=Thermal
 
+tile.chisel.coral.name=Coral
+tile.coral.0.desc=Brain Coral
+tile.coral.1.desc=Bubble Coral
+tile.coral.2.desc=Fire Coral
+tile.coral.3.desc=Horn Coral
+tile.coral.4.desc=Tube Coral
+tile.coral.5.desc=Dead Brain Coral
+tile.coral.6.desc=Dead Bubble Coral
+tile.coral.7.desc=Dead Fire Coral
+tile.coral.8.desc=Dead Horn Coral
+tile.coral.9.desc=Dead Tube Coral
+tile.coral.10.desc=Brain Coral Bricks
+tile.coral.11.desc=Bubble Coral Bricks
+tile.coral.12.desc=Fire Coral Bricks
+tile.coral.13.desc=Horn Coral Bricks
+tile.coral.14.desc=Tube Coral Bricks
+tile.coral.15.desc=Dead Coral Bricks
+
+tile.chisel.mud.name=Mud
+tile.mud.0.desc=Black Mud
+tile.mud.1.desc=Loamy Mud
+tile.mud.2.desc=Carbonate Mud (Marl)
+tile.mud.3.desc=Brown Mud
+tile.mud.4.desc=Packed Mud
+tile.mud.5.desc=Rooted Mud
+tile.mud.6.desc=Mud Bricks
 
 tile.chisel.amber.name=Block of Amber
 tile.chisel.bloodBrick.name=Bloodstone Brick