diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 0dde4d65..bf5a7344 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -8,6 +8,7 @@ import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.item.ItemCarvable; import com.cricketcraft.chisel.item.ItemMarbleSlab; + import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -83,6 +84,7 @@ public class ModBlocks { public static BlockCarvable hexPlating; public static BlockCarvable technical; public static BlockCarvable bone; + public static BlockCarvable scorching; // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; @@ -1500,7 +1502,6 @@ public class ModBlocks { technical.carverHelper.register(technical, "technical"); Carving.chisel.registerOre("technical", "technical"); } - if(Configurations.featureEnabled("bone")) { bone = (BlockCarvable) new BlockCarvable(Material.rock); @@ -1512,5 +1513,16 @@ public class ModBlocks { bone.carverHelper.register(bone, "bone"); Carving.chisel.registerOre("bone", "bone"); } + if(Configurations.featureEnabled("scorching")) + { + scorching = (BlockCarvable) new BlockCarvable(Material.rock).setLightLevel(1F); + scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.0.desc"), 0, "scorching/scorch"); + scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.1.desc"), 1, "scorching/bordered"); + scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.2.desc"), 2, "scorching/beveled"); + scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.3.desc"), 3, "scorching/cracked"); + scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.4.desc"), 4, "scorching/deep"); + scorching.carverHelper.register(scorching, "scorching"); + Carving.chisel.registerOre("scorching", "scorching"); + } } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 7ce05c7a..1e8ee66a 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -134,6 +134,13 @@ tile.technical.6.desc=Fan (Off) tile.technical.7.desc=Vents tile.technical.8.desc=Glowing Vents +tile.scorching.name=Scorching Block +tile.scorching.0.desc=Solidified Fire +tile.scorching.1.desc=Edged Solidified Fire +tile.scorching.2.desc=Beveled Solidified Fire +tile.scorching.3.desc=Burn Stone Encased Solidified Fire +tile.scorching.4.desc=Deep Core Block + #Cloudbrick tile.cloudbrick.name=Cloudbrick tile.cloudbrick.0.name=Large Cloudbricks diff --git a/src/main/resources/assets/chisel/textures/blocks/scorching/a0-mob-fireobsidian.png b/src/main/resources/assets/chisel/textures/blocks/scorching/a0-mob-fireobsidian.png deleted file mode 100755 index a5269eb0..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/scorching/a0-mob-fireobsidian.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/scorching/a1-brick-orangehewn.png b/src/main/resources/assets/chisel/textures/blocks/scorching/a1-brick-orangehewn.png deleted file mode 100755 index 451f4d85..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/scorching/a1-brick-orangehewn.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/scorching/blaze.png b/src/main/resources/assets/chisel/textures/blocks/scorching/blaze.png deleted file mode 100755 index 8eb41127..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/scorching/blaze.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png index 979fe5ea..cb1663bf 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png and b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png differ