diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 9cb245eb..3b3d767c 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -953,8 +953,19 @@ public enum Features { Carving.chisel.addVariation("gold_block", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 5, 0); } + BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + .setResistance(10F); + gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution"); + gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate"); + gold2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/gold/thermal"); + gold2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/gold/adv"); + gold2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/gold/egregious"); + gold2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/gold/bolted"); + gold2.carverHelper.registerBlock(gold2, "gold2"); + gold2.carverHelper.registerVariations("gold_block", gold2); + gold_block.carverHelper.registerAll(gold_block, "gold_block"); - Carving.chisel.registerOre("gold_block", "gold"); + Carving.chisel.registerOre("gold_block", "blockGold"); } }, @@ -1206,8 +1217,19 @@ public enum Features { Carving.chisel.addVariation("iron_block", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 4, 0); } + BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + .setResistance(10F); + iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution"); + iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate"); + iron2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/iron/thermal"); + iron2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/iron/adv"); + iron2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/iron/egregious"); + iron2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/iron/bolted"); + iron2.carverHelper.registerBlock(iron2, "iron2"); + iron2.carverHelper.registerVariations("iron_block", iron2); + iron_block.carverHelper.registerAll(iron_block, "iron_block"); - Carving.chisel.registerOre("iron_block", "iron"); + Carving.chisel.registerOre("iron_block", "blockIron"); } }, diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6d88b2b8..515c1687 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -287,6 +287,8 @@ tile.technical3.1.desc=Industrial Armor Plating tile.chisel.aluminumblock.name=Block of Aluminum tile.chisel.bronzeblock.name=Block of Bronze tile.chisel.copperblock.name=Block of Copper +tile.chisel.gold2.name=Block of Gold +tile.chisel.iron2.name=Block of Iron tile.chisel.leadblock.name=Block of Lead tile.chisel.silverblock.name=Block of Silver tile.chisel.steelblock.name=Block of Steel diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/black-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/black-antiBlock.png index 896bbc2c..64534b96 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/black-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/black-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock-ctm.png index b8fa831d..68da4427 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock.png index 18a382dd..5d40f3eb 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/blue-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock-ctm.png index 4ad8e32d..89991e10 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock.png index d3eb022f..f7dcb6ce 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/brown-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock-ctm.png index e8227b9c..6ac1d47b 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock.png index f128f9c2..1561607b 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/cyan-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock-ctm.png index 2733a321..e137bbd8 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock.png index 41760853..3711591a 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/green-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock-ctm.png index 60b494ed..50bf8822 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock.png index d4ec7ee2..51092002 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/light_blue-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock-ctm.png index 939cdafa..5930203d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock.png index 75ff99d6..47434922 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/lime-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock-ctm.png index 7c4c4dab..a310d0b2 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock.png index 6530686f..1189e79f 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/magenta-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock-ctm.png index 83e1ff9a..4919ba4d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock.png index aef5e531..89bc4dd8 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/orange-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock-ctm.png index 2fdb6366..2ed8e496 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock.png index 61470ff1..7fe52de8 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/pink-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock-ctm.png index 32967cc9..524abba0 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock.png index ebe1f83e..93057bad 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/purple-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock-ctm.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock-ctm.png index 50519b6a..d24953e6 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock.png index e73ad4b5..f8d21dc4 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/red-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/antiblock/yellow-antiBlock.png b/src/main/resources/assets/chisel/textures/blocks/antiblock/yellow-antiBlock.png index 726b1039..615d9aa7 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/antiblock/yellow-antiBlock.png and b/src/main/resources/assets/chisel/textures/blocks/antiblock/yellow-antiBlock.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/adv.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/adv.png new file mode 100644 index 00000000..326ef975 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/adv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/bolted.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/bolted.png new file mode 100644 index 00000000..dda01e39 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/bolted.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/caution-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/caution-ctm.png new file mode 100644 index 00000000..51ea7dbb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/caution-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/caution.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/caution.png new file mode 100644 index 00000000..b1da2036 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/caution.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/crate-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/crate-ctm.png new file mode 100644 index 00000000..80019a1f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/crate-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/crate.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/crate.png new file mode 100644 index 00000000..d5f722c2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/crate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/egregious-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/egregious-ctm.png new file mode 100644 index 00000000..27712b9d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/egregious-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/egregious.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/egregious.png new file mode 100644 index 00000000..ed4f7ce8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/egregious.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/gold/thermal.png b/src/main/resources/assets/chisel/textures/blocks/metals/gold/thermal.png new file mode 100644 index 00000000..0c1b5940 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/gold/thermal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/adv.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/adv.png new file mode 100644 index 00000000..8faaa598 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/adv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/bolted.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/bolted.png new file mode 100644 index 00000000..36b69300 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/bolted.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/caution-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/caution-ctm.png new file mode 100644 index 00000000..413ceaa9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/caution-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/caution.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/caution.png new file mode 100644 index 00000000..855ea19e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/caution.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/crate-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/crate-ctm.png new file mode 100644 index 00000000..4edeb314 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/crate-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/crate.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/crate.png new file mode 100644 index 00000000..88583716 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/crate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/egregious-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/egregious-ctm.png new file mode 100644 index 00000000..28ab92cb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/egregious-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/egregious.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/egregious.png new file mode 100644 index 00000000..c865cd26 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/egregious.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/iron/thermal.png b/src/main/resources/assets/chisel/textures/blocks/metals/iron/thermal.png new file mode 100644 index 00000000..a7e1bb7b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/metals/iron/thermal.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/adv.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/adv.png index 8faaa598..35b3b947 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/adv.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/adv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/bolted.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/bolted.png index 36b69300..7251493c 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/bolted.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/bolted.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution-ctm.png index 413ceaa9..0ff37d7d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution.png index 855ea19e..c31eeeef 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/caution.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate-ctm.png index 4edeb314..c058b103 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate.png index 88583716..a78a9f0b 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/crate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious-ctm.png index 28ab92cb..3214a32e 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious.png index c865cd26..22650166 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/egregious.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/steel/thermal.png b/src/main/resources/assets/chisel/textures/blocks/metals/steel/thermal.png index a7e1bb7b..296ad1ff 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/metals/steel/thermal.png and b/src/main/resources/assets/chisel/textures/blocks/metals/steel/thermal.png differ