diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index fc2b856..58af764 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -71,6 +71,13 @@ public class ChiselBlocks public static BlockSpikes blockSpiketrap; + public static BlockCarvable blockRoofRed; + public static BlockCarvable blockRoofBlue; + public static BlockCarvable blockRoofBrown; + public static BlockCarvable blockRoofOrange; + public static BlockCarvable blockRoofGreen; + public static BlockCarvable blockRoofBlack; + // 1.7 public static BlockCarvableGlass[] blockStainedGlass = new BlockCarvableGlass[4]; public static BlockCarvablePane[] blockStainedGlassPane = new BlockCarvablePane[8]; @@ -1249,6 +1256,63 @@ public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper) blockLaboratory.carverHelper.register(blockLaboratory, "blockLaboratory"); } + if(Configurations.featureEnabled("stainedClay")){ + + blockRoofRed= (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("roofRed", Blocks.stained_hardened_clay, 14, 0); + blockRoofRed.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofRed.1.desc"), 1, "stainedclay/roof_red_1"); + blockRoofRed.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofRed.2.desc"), 2, "stainedclay/roof_red_2"); + blockRoofRed.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofRed.3.desc"), 3, "stainedclay/roof_red_3"); + blockRoofRed.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofRed.4.desc"), 4, "stainedclay/roof_red_4"); + blockRoofRed.carverHelper.register(blockRoofRed, "roofRed"); + Carving.chisel.registerOre("roofRed", "blockRoofRed"); + + blockRoofBlue= (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("roofBlue", Blocks.stained_hardened_clay, 11, 0); + blockRoofBlue.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlue.1.desc"), 1, "stainedclay/roof_blue_1"); + blockRoofBlue.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlue.2.desc"), 2, "stainedclay/roof_blue_2"); + blockRoofBlue.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlue.3.desc"), 3, "stainedclay/roof_blue_3"); + blockRoofBlue.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlue.4.desc"), 4, "stainedclay/roof_blue_4"); + blockRoofBlue.carverHelper.register(blockRoofBlue, "roofBlue"); + Carving.chisel.registerOre("roofBlue", "blockRoofBlue"); + + blockRoofBrown= (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("roofBrown", Blocks.stained_hardened_clay, 12, 0); + blockRoofBrown.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBrown.1.desc"), 1, "stainedclay/roof_brown_1"); + blockRoofBrown.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBrown.2.desc"), 2, "stainedclay/roof_brown_2"); + blockRoofBrown.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBrown.3.desc"), 3, "stainedclay/roof_brown_3"); + blockRoofBrown.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBrown.4.desc"), 4, "stainedclay/roof_brown_4"); + blockRoofBrown.carverHelper.register(blockRoofBrown, "roofBrown"); + Carving.chisel.registerOre("roofBrown", "blockRoofBrown"); + + blockRoofOrange= (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("roofOrange", Blocks.stained_hardened_clay, 1, 0); + blockRoofOrange.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofOrange.1.desc"), 1, "stainedclay/roof_copper_1"); + blockRoofOrange.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofOrange.2.desc"), 2, "stainedclay/roof_copper_2"); + blockRoofOrange.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofOrange.3.desc"), 3, "stainedclay/roof_copper_3"); + blockRoofOrange.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofOrange.4.desc"), 4, "stainedclay/roof_copper_4"); + blockRoofOrange.carverHelper.register(blockRoofOrange, "roofOrange"); + Carving.chisel.registerOre("roofOrange", "blockRoofOrange"); + + blockRoofGreen= (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("roofGreen", Blocks.stained_hardened_clay, 13, 0); + blockRoofGreen.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofGreen.1.desc"), 1, "stainedclay/roof_green_1"); + blockRoofGreen.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofGreen.2.desc"), 2, "stainedclay/roof_green_2"); + blockRoofGreen.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofGreen.3.desc"), 3, "stainedclay/roof_green_3"); + blockRoofGreen.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofGreen.4.desc"), 4, "stainedclay/roof_green_4"); + blockRoofGreen.carverHelper.register(blockRoofGreen, "roofGreen"); + Carving.chisel.registerOre("roofGreen", "blockRoofGreen"); + + blockRoofBlack= (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("roofBlack", Blocks.stained_hardened_clay, 15, 0); + blockRoofBlack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlack.1.desc"), 1, "stainedclay/roof_black_1"); + blockRoofBlack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlack.2.desc"), 2, "stainedclay/roof_black_2"); + blockRoofBlack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlack.3.desc"), 3, "stainedclay/roof_black_3"); + blockRoofBlack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.roofBlack.4.desc"), 4, "stainedclay/roof_black_4"); + blockRoofBlack.carverHelper.register(blockRoofBlack, "roofBlack"); + Carving.chisel.registerOre("roofBlack", "blockRoofBlack"); + } + Blocks.stone.setHarvestLevel("chisel", 0, 0); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 46468d1..c311287 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -720,5 +720,37 @@ chisel.tile.blockLaboratory.13.desc=Direction Console (Right) chisel.tile.blockLaboratory.14.desc=Direction Console (Left) chisel.tile.blockLaboratory.15.desc=Information Console +#Stained Clay +chisel.tile.roofRed.name=Roof Tile +chisel.tile.roofRed.1.desc=Red Roof 1 +chisel.tile.roofRed.2.desc=Red Roof 2 +chisel.tile.roofRed.3.desc=Red Roof 3 +chisel.tile.roofRed.4.desc=Red Roof 4 +chisel.tile.roofBlue.name=Roof +chisel.tile.roofBlue.1.desc=Blue Roof 1 +chisel.tile.roofBlue.2.desc=Blue Roof 2 +chisel.tile.roofBlue.3.desc=Blue Roof 3 +chisel.tile.roofBlue.4.desc=Blue Roof 4 +chisel.tile.roofBrown.name=Roof Tile +chisel.tile.roofBrown.1.desc=Brown Roof 1 +chisel.tile.roofBrown.2.desc=Brown Roof 2 +chisel.tile.roofBrown.3.desc=Brown Roof 3 +chisel.tile.roofBrown.4.desc=Brown Roof 4 +chisel.tile.roofOrange.name=Roof Tile +chisel.tile.roofOrange.1.desc=Orange Roof 1 +chisel.tile.roofOrange.2.desc=Orange Roof 2 +chisel.tile.roofOrange.3.desc=Orange Roof 3 +chisel.tile.roofOrange.4.desc=Orange Roof 4 +chisel.tile.roofGreen.name=Roof Tile +chisel.tile.roofGreen.1.desc=Green Roof 1 +chisel.tile.roofGreen.2.desc=Green Roof 2 +chisel.tile.roofGreen.3.desc=Green Roof 3 +chisel.tile.roofGreen.4.desc=Green Roof 4 +chisel.tile.roofBlack.name=Roof Tile +chisel.tile.roofBlack.1.desc=Black Roof 1 +chisel.tile.roofBlack.2.desc=Black Roof 2 +chisel.tile.roofBlack.3.desc=Black Roof 3 +chisel.tile.roofBlack.4.desc=Black Roof 4 + # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_1.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_1.png new file mode 100644 index 0000000..a844aae Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_2.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_2.png new file mode 100644 index 0000000..a9bb995 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_3.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_3.png new file mode 100644 index 0000000..11e0433 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_4.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_4.png new file mode 100644 index 0000000..d9a47e5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_black_4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_1.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_1.png new file mode 100644 index 0000000..398e683 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_2.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_2.png new file mode 100644 index 0000000..25a55c6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_3.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_3.png new file mode 100644 index 0000000..42cd83f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_4.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_4.png new file mode 100644 index 0000000..ef9d02f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_blue_4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_1.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_1.png new file mode 100644 index 0000000..eccb0b1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_2.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_2.png new file mode 100644 index 0000000..4ab6c31 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_3.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_3.png new file mode 100644 index 0000000..0186651 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_4.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_4.png new file mode 100644 index 0000000..4d889c1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_brown_4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_1.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_1.png new file mode 100644 index 0000000..a37eafa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_2.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_2.png new file mode 100644 index 0000000..b7a2f21 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_3.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_3.png new file mode 100644 index 0000000..0c0127d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_4.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_4.png new file mode 100644 index 0000000..ce19d9d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_copper_4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_1.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_1.png new file mode 100644 index 0000000..08850fd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_2.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_2.png new file mode 100644 index 0000000..295602f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_3.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_3.png new file mode 100644 index 0000000..9a317e9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_4.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_4.png new file mode 100644 index 0000000..440287b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_green_4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_1.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_1.png new file mode 100644 index 0000000..e83a2de Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_2.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_2.png new file mode 100644 index 0000000..7b16c51 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_3.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_3.png new file mode 100644 index 0000000..563eae7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_4.png b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_4.png new file mode 100644 index 0000000..36956c2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/stainedclay/roof_red_4.png differ