From 0f3a28bdc34b6242bbdb3eeed96678785be7117c Mon Sep 17 00:00:00 2001 From: Drullkus Date: Mon, 9 Mar 2015 15:46:16 -0700 Subject: [PATCH] Untested - Added TCon Chisel blocks --- .../com/cricketcraft/chisel/Features.java | 107 ++++++++++++++++-- 1 file changed, 99 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 593b200a..41c1ffde 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -569,7 +569,14 @@ public enum Features { diamond_block.carverHelper.addVariation("tile.diamond.10.desc", 10, "diamond/terrain-diamond-fourornate"); diamond_block.carverHelper.addVariation("tile.diamond.11.desc", 11, "diamond/terrain-diamond-zelda"); diamond_block.carverHelper.addVariation("tile.diamond.12.desc", 12, "diamond/terrain-diamond-ornatelayer"); - diamond_block.carverHelper.registerAll(diamond_block, "diamond_block"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 7, 0); + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 7, 0); + } + + diamond_block.carverHelper.registerAll(diamond_block, "diamond_block"); Carving.chisel.registerOre("diamond_block", "diamond"); } }, @@ -649,6 +656,30 @@ public enum Features { } }, + END_STONE { + + @Override + void addBlocks() { + //BlockCarvable end_stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + Carving.chisel.addVariation("end_stone", Blocks.end_stone , 0, 0); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("end_stone", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 12, 0); + Carving.chisel.addVariation("end_stone", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 12, 0); + } + + if (Loader.isModLoaded("Botania")) + { + Carving.chisel.addVariation("end_stone", GameRegistry.findBlock("Botania", ""), 12, 0); + Carving.chisel.addVariation("end_stone", GameRegistry.findBlock("Botania", "endStoneBrick"), 12, 0); + } + + //end_stone.carverHelper.registerAll(emerald_block, "endStone"); + Carving.chisel.registerOre("end_stone", "end_stone"); + } + }, + FACTORY { @Override @@ -915,7 +946,14 @@ public enum Features { gold_block.carverHelper.addVariation("tile.gold.12.desc", 12, "gold/terrain-gold-space"); gold_block.carverHelper.addVariation("tile.gold.13.desc", 13, "gold/terrain-gold-spaceblack"); gold_block.carverHelper.addVariation("tile.gold.14.desc", 14, "gold/terrain-gold-simple"); - gold_block.carverHelper.registerAll(gold_block, "gold_block"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("gold_block", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 5, 0); + Carving.chisel.addVariation("gold_block", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 5, 0); + } + + gold_block.carverHelper.registerAll(gold_block, "gold_block"); Carving.chisel.registerOre("gold_block", "gold"); } }, @@ -1161,7 +1199,14 @@ public enum Features { iron_block.carverHelper.addVariation("tile.iron.13.desc", 13, "iron/terrain-iron-spaceblack"); iron_block.carverHelper.addVariation("tile.iron.14.desc", 14, "iron/terrain-iron-vents"); iron_block.carverHelper.addVariation("tile.iron.15.desc", 15, "iron/terrain-iron-simple"); - iron_block.carverHelper.registerAll(iron_block, "iron_block"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("iron_block", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 4, 0); + Carving.chisel.addVariation("iron_block", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 4, 0); + } + + iron_block.carverHelper.registerAll(iron_block, "iron_block"); Carving.chisel.registerOre("iron_block", "iron"); } }, @@ -1230,7 +1275,14 @@ public enum Features { lapis_block.carverHelper.addVariation("tile.lapis.6.desc", 6, "lapis/a1-blocklapis-panel"); lapis_block.carverHelper.addVariation("tile.lapis.7.desc", 7, "lapis/a1-blocklapis-smooth"); lapis_block.carverHelper.addVariation("tile.lapis.8.desc", 8, "lapis/a1-blocklapis-ornatelayer"); - lapis_block.carverHelper.registerAll(lapis_block, "lapis_block"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 6, 0); + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 6, 0); + } + + lapis_block.carverHelper.registerAll(lapis_block, "lapis_block"); Carving.chisel.registerOre("lapis_block", "lapis"); } }, @@ -1661,7 +1713,14 @@ public enum Features { netherrack.carverHelper.addVariation("tile.hellrock.12.desc", 12, "netherrack/a1-netherrack-meatrock"); netherrack.carverHelper.addVariation("tile.hellrock.13.desc", 13, "netherrack/a1-netherrack-red"); netherrack.carverHelper.addVariation("tile.hellrock.14.desc", 14, "netherrack/a1-netherrack-wells"); - netherrack.carverHelper.registerAll(netherrack, "netherrack"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 2, 0); + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 2, 0); + } + + netherrack.carverHelper.registerAll(netherrack, "netherrack"); Carving.chisel.registerOre("netherrack", "netherrack"); } }, @@ -1688,7 +1747,16 @@ public enum Features { obsidian.carverHelper.addVariation("tile.obsidian.13.desc", 13, "obsidian/tiles"); obsidian.carverHelper.addVariation("tile.obsidian.14.desc", 14, "obsidian/greek"); obsidian.carverHelper.addVariation("tile.obsidian.15.desc", 15, "obsidian/crate"); - obsidian.carverHelper.registerAll(obsidian, "obsidian"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("obsidian", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 0, 0); + Carving.chisel.addVariation("obsidian", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 13, 0); + Carving.chisel.addVariation("obsidian", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 0, 0); + Carving.chisel.addVariation("obsidian", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 13, 0); + } + + obsidian.carverHelper.registerAll(obsidian, "obsidian"); Carving.chisel.registerOre("obsidian", "obsidian"); } }, @@ -2032,7 +2100,14 @@ public enum Features { redstone_block.carverHelper.addVariation("tile.redstone_block.13.desc", 13, "redstone/supaplex"); redstone_block.carverHelper.addVariation("tile.redstone_block.14.desc", 14, "redstone/a1-blockredstone-skullred"); redstone_block.carverHelper.addVariation("tile.redstone_block.15.desc", 15, "redstone/a1-blockredstone-redstonezelda"); - redstone_block.carverHelper.registerAll(redstone_block, "redstone_block"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 8, 0); + Carving.chisel.addVariation("netherrack", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 8, 0); + } + + redstone_block.carverHelper.registerAll(redstone_block, "redstone_block"); Carving.chisel.registerOre("redstone_block", "redstone"); } }, @@ -2078,7 +2153,14 @@ public enum Features { sandstone.carverHelper.addVariation("tile.sandstone.13.desc", 13, "sandstone/blocks"); sandstone.carverHelper.addVariation("tile.sandstone.14.desc", 14, "sandstone/mosaic"); sandstone.carverHelper.addVariation("tile.sandstone.15.desc", 15, "sandstone/horizontal-tiles"); - sandstone.carverHelper.registerAll(sandstone, "sandstone"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("sandstone", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 1, 0); + Carving.chisel.addVariation("sandstone", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 1, 0); + } + + sandstone.carverHelper.registerAll(sandstone, "sandstone"); Carving.chisel.registerOre("sandstone", "sandstone"); } @@ -2257,6 +2339,15 @@ public enum Features { stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.13.desc", 13, "stonebrick/sunken"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.14.desc", 14, "stonebrick/ornatepanel"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.15.desc", 15, "stonebrick/poison"); + + if (Loader.isModLoaded("TConstruct")) + { + Carving.chisel.addVariation("stonebricksmooth", GameRegistry.findBlock("TConstruct", "decoration.multibrick"), 3, 0); + Carving.chisel.addVariation("stonebricksmooth", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 3, 0); + Carving.chisel.addVariation("stonebricksmooth", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 14, 0); + Carving.chisel.addVariation("stonebricksmooth", GameRegistry.findBlock("TConstruct", "decoration.multibrickfancy"), 15, 0); + } + stonebricksmooth.carverHelper.registerAll(stonebricksmooth, "stonebricksmooth"); Carving.chisel.registerOre("stonebricksmooth", "stonebricksmooth");