diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index a0d7fa06..38d43872 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -4613,8 +4613,47 @@ public enum Features { 'i', new ItemStack(Items.iron_ingot, 1, 0)); } + }, + + MOSS { + + @Override + void addBlocks() { + BlockCarvable moss = (BlockCarvable) new BlockCarvable(Material.wood) + .setStepSound(Block.soundTypeDirt) + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1F) + .setResistance(1F); + moss.carverHelper.addVariation("tile.moss.0.desc", 0, "moss/moss"); + moss.carverHelper.addVariation("tile.moss.1.desc", 1, "moss/pale_moss"); + moss.carverHelper.addVariation("tile.moss.2.desc", 2, "moss/dark_moss"); + moss.carverHelper.addVariation("tile.moss.3.desc", 3, "moss/dry_moss"); + moss.carverHelper.addVariation("tile.moss.4.desc", 4, "moss/golden_moss"); + moss.carverHelper.addVariation("tile.moss.5.desc", 5, "moss/infused_moss"); + moss.carverHelper.addVariation("tile.moss.6.desc", 6, "moss/mutated_moss"); + moss.carverHelper.addVariation("tile.moss.7.desc", 7, "moss/scorched_moss"); + moss.carverHelper.addVariation("tile.moss.8.desc", 8, "moss/vivid_moss"); + moss.carverHelper.addVariation("tile.moss.9.desc", 9, "moss/peat_moss"); + moss.carverHelper.addVariation("tile.moss.10.desc", 10, "moss/pink_sphagnum_moss"); + moss.carverHelper.registerAll(moss, "moss"); + Carving.chisel.registerOre("moss", "blockMoss"); + } + + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.lantern, 1, 0), + "ggg", + "gMg", + "ggg", + 'M', + new ItemStack(Items.ballomoss, 1), + 'g', + new ItemStack(Blocks.dirt, 1)); + } }; + private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 03289fb0..795f70eb 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -177,5 +177,9 @@ public final class ChiselBlocks { public static final BlockCarvable lantern = null; public static final BlockCarvable sheetmetal = null; + // June Additions + public static final BlockCarvable moss = null; + public static final BlockCarvableCarpet moss_carpet = null; + private ChiselBlocks() {} } diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/dark_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/dark_moss.png new file mode 100644 index 00000000..3185177c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/dark_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/dry_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/dry_moss.png new file mode 100644 index 00000000..ff4d4b64 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/dry_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/golden_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/golden_moss.png new file mode 100644 index 00000000..a4df2762 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/golden_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/infused_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/infused_moss.png new file mode 100644 index 00000000..adec3e08 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/infused_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/moss.png new file mode 100644 index 00000000..e5009095 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/mutated_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/mutated_moss.png new file mode 100644 index 00000000..4dd4020c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/mutated_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/pale_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/pale_moss.png new file mode 100644 index 00000000..c43d3dc0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/pale_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/peat_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/peat_moss.png new file mode 100644 index 00000000..de10e025 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/peat_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/pink_sphagnum_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/pink_sphagnum_moss.png new file mode 100644 index 00000000..cb40c60f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/pink_sphagnum_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/scorched_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/scorched_moss.png new file mode 100644 index 00000000..a0358c84 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/scorched_moss.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/moss/vivid_moss.png b/src/main/resources/assets/chisel/textures/blocks/moss/vivid_moss.png new file mode 100644 index 00000000..09303f3a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/moss/vivid_moss.png differ