diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index c25f29ac0..3fe1d6f18 100644 --- a/src/main/java/team/chisel/Features.java +++ b/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(); diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 44a2bba23..9c1194505 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/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() {} } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index ce1634434..6a7293eb4 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/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 diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteCobblestone.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteCobblestone.png new file mode 100644 index 000000000..3aaa8c4e4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteCobblestone.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteModern.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteModern.png new file mode 100644 index 000000000..756f0267b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteModern.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteMossy.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteMossy.png new file mode 100644 index 000000000..20951911e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/andesite/andesiteMossy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/andesite_weathered.png b/src/main/resources/assets/chisel/textures/blocks/andesite/andesite_weathered.png new file mode 100644 index 000000000..fe2731790 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/andesite/andesite_weathered.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/andesite/polished_andesite.png b/src/main/resources/assets/chisel/textures/blocks/andesite/polished_andesite.png new file mode 100644 index 000000000..d0aa05b76 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/andesite/polished_andesite.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/black_bricks.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/black_bricks.png new file mode 100644 index 000000000..bc66eadea Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/black_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_panel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_panel-ctm.png new file mode 100644 index 000000000..662a18ca7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_panel-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_panel.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_panel.png new file mode 100644 index 000000000..3517fcaaa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_panel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_tile.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_tile.png new file mode 100644 index 000000000..b8dcd8ea2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brick_tile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/brown_bricks.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brown_bricks.png new file mode 100644 index 000000000..3208a6d63 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/brown_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/modern.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/modern.png new file mode 100644 index 000000000..333974a5a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/modern.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/mortar.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/mortar.png new file mode 100644 index 000000000..0447dfccc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/mortar.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/mossy.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/mossy.png new file mode 100644 index 000000000..49a97aa63 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/mossy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/neutral.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/neutral.png new file mode 100644 index 000000000..87101221f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/neutral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/sooty.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/sooty.png new file mode 100644 index 000000000..2abbc1600 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/sooty.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/vivid.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/vivid.png new file mode 100644 index 000000000..7169e0c61 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/vivid.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/white_bricks.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/white_bricks.png new file mode 100644 index 000000000..ae923f3f8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/brickCustom/white_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/brain_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/brain_coral.png new file mode 100644 index 000000000..6e958ede5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/brain_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/brain_coral_bricks.png b/src/main/resources/assets/chisel/textures/blocks/coral/brain_coral_bricks.png new file mode 100644 index 000000000..0af005f03 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/brain_coral_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/bubble_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/bubble_coral.png new file mode 100644 index 000000000..b86ead588 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/bubble_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/bubble_coral_bricks.png b/src/main/resources/assets/chisel/textures/blocks/coral/bubble_coral_bricks.png new file mode 100644 index 000000000..d08d954ad Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/bubble_coral_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/dead_brain_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/dead_brain_coral.png new file mode 100644 index 000000000..046bdd4f7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/dead_brain_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/dead_bubble_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/dead_bubble_coral.png new file mode 100644 index 000000000..cdeb2fe06 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/dead_bubble_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/dead_coral_bricks.png b/src/main/resources/assets/chisel/textures/blocks/coral/dead_coral_bricks.png new file mode 100644 index 000000000..308744b5b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/dead_coral_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/dead_fire_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/dead_fire_coral.png new file mode 100644 index 000000000..a10eaa398 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/dead_fire_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/dead_horn_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/dead_horn_coral.png new file mode 100644 index 000000000..ffd5ab923 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/dead_horn_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/dead_tube_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/dead_tube_coral.png new file mode 100644 index 000000000..36a127f28 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/dead_tube_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/fire_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/fire_coral.png new file mode 100644 index 000000000..de7c2dab8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/fire_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/fire_coral_bricks.png b/src/main/resources/assets/chisel/textures/blocks/coral/fire_coral_bricks.png new file mode 100644 index 000000000..cd41160fe Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/fire_coral_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/horn_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/horn_coral.png new file mode 100644 index 000000000..1e85c7c56 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/horn_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/horn_coral_bricks.png b/src/main/resources/assets/chisel/textures/blocks/coral/horn_coral_bricks.png new file mode 100644 index 000000000..cbf1c84a6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/horn_coral_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/tube_coral.png b/src/main/resources/assets/chisel/textures/blocks/coral/tube_coral.png new file mode 100644 index 000000000..756d32d8d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/tube_coral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/coral/tube_coral_bricks.png b/src/main/resources/assets/chisel/textures/blocks/coral/tube_coral_bricks.png new file mode 100644 index 000000000..952464ba3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/coral/tube_coral_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteCobblestone.png b/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteCobblestone.png new file mode 100644 index 000000000..5d9f1e6ee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteCobblestone.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteModern.png b/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteModern.png new file mode 100644 index 000000000..3a02f5ff6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteModern.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteMossy.png b/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteMossy.png new file mode 100644 index 000000000..1685aaa4a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/diorite/dioriteMossy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/diorite_black.png b/src/main/resources/assets/chisel/textures/blocks/diorite/diorite_black.png new file mode 100644 index 000000000..4b5c89d0e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/diorite/diorite_black.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/diorite_hornblende.png b/src/main/resources/assets/chisel/textures/blocks/diorite/diorite_hornblende.png new file mode 100644 index 000000000..059043117 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/diorite/diorite_hornblende.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/diorite/polished_diorite.png b/src/main/resources/assets/chisel/textures/blocks/diorite/polished_diorite.png new file mode 100644 index 000000000..2df8bc55d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/diorite/polished_diorite.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glass/connected_glass-ctm.png b/src/main/resources/assets/chisel/textures/blocks/glass/connected_glass-ctm.png new file mode 100644 index 000000000..43ee14d83 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glass/connected_glass-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glass/connected_glass.png b/src/main/resources/assets/chisel/textures/blocks/glass/connected_glass.png new file mode 100644 index 000000000..a4c86c37c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glass/connected_glass.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glass/modern_glass-ctm.png b/src/main/resources/assets/chisel/textures/blocks/glass/modern_glass-ctm.png new file mode 100644 index 000000000..392d7ed30 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glass/modern_glass-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/glass/modern_glass.png b/src/main/resources/assets/chisel/textures/blocks/glass/modern_glass.png new file mode 100644 index 000000000..880ab8d21 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/glass/modern_glass.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/granite/graniteCobblestone.png b/src/main/resources/assets/chisel/textures/blocks/granite/graniteCobblestone.png new file mode 100644 index 000000000..458097204 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/granite/graniteCobblestone.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/granite/graniteMineralSand.png b/src/main/resources/assets/chisel/textures/blocks/granite/graniteMineralSand.png new file mode 100644 index 000000000..1bce9b50a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/granite/graniteMineralSand.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/granite/graniteModern.png b/src/main/resources/assets/chisel/textures/blocks/granite/graniteModern.png new file mode 100644 index 000000000..1e67b667b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/granite/graniteModern.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/granite/graniteModernPolished.png b/src/main/resources/assets/chisel/textures/blocks/granite/graniteModernPolished.png new file mode 100644 index 000000000..ea5414822 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/granite/graniteModernPolished.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/granite/graniteMossy.png b/src/main/resources/assets/chisel/textures/blocks/granite/graniteMossy.png new file mode 100644 index 000000000..3038ce2a5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/granite/graniteMossy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/cobalt/thermal-bottom.png b/src/main/resources/assets/chisel/textures/blocks/metals/cobalt/thermal-bottom.png deleted file mode 100644 index e3a5c0161..000000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/cobalt/thermal-bottom.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/electrum/thermal-bottom.png b/src/main/resources/assets/chisel/textures/blocks/metals/electrum/thermal-bottom.png deleted file mode 100644 index e02747547..000000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/electrum/thermal-bottom.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/invar/thermal-bottom.png b/src/main/resources/assets/chisel/textures/blocks/metals/invar/thermal-bottom.png deleted file mode 100644 index 744331e09..000000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/invar/thermal-bottom.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/nickel/thermal-bottom.png b/src/main/resources/assets/chisel/textures/blocks/metals/nickel/thermal-bottom.png deleted file mode 100644 index 908eaa6e4..000000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/nickel/thermal-bottom.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/platinum/thermal-bottom.png b/src/main/resources/assets/chisel/textures/blocks/metals/platinum/thermal-bottom.png deleted file mode 100644 index 7d7154742..000000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/platinum/thermal-bottom.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/brown_mud.png b/src/main/resources/assets/chisel/textures/blocks/mud/brown_mud.png new file mode 100644 index 000000000..dfe6a1b12 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/brown_mud.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/loamy_mud.png b/src/main/resources/assets/chisel/textures/blocks/mud/loamy_mud.png new file mode 100644 index 000000000..4d312aad6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/loamy_mud.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/marl.png b/src/main/resources/assets/chisel/textures/blocks/mud/marl.png new file mode 100644 index 000000000..2f0ca10f3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/marl.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/mud.png b/src/main/resources/assets/chisel/textures/blocks/mud/mud.png new file mode 100644 index 000000000..15ebff388 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/mud.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/mud_bricks.png b/src/main/resources/assets/chisel/textures/blocks/mud/mud_bricks.png new file mode 100644 index 000000000..3dbab97ec Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/mud_bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/packed_mud.png b/src/main/resources/assets/chisel/textures/blocks/mud/packed_mud.png new file mode 100644 index 000000000..6919f3533 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/packed_mud.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/rooted_mud-side.png b/src/main/resources/assets/chisel/textures/blocks/mud/rooted_mud-side.png new file mode 100644 index 000000000..7ec28c356 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/rooted_mud-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mud/rooted_mud-top.png b/src/main/resources/assets/chisel/textures/blocks/mud/rooted_mud-top.png new file mode 100644 index 000000000..e9f75da69 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mud/rooted_mud-top.png differ