diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 373f3eb2..e5fd6728 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -94,6 +94,8 @@ public class ModBlocks { public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16]; public static BlockCarvable sign; public static BlockCarvable arcane; + public static BlockCarvable OCD; + public static BlockCarvable OCD2; // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; @@ -1807,5 +1809,51 @@ public class ModBlocks { Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 5, 5); Carving.chisel.registerOre("RCBloodStained", "RCBloodStained"); } + if (Configurations.featureEnabled("OCD")) + { + OCD = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + OCD.carverHelper.setChiselBlockName("OCD"); + OCD.carverHelper.register(OCD, "OCD"); + + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.0.desc"), 0, "OCD/White-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.1.desc"), 1, "OCD/White-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.2.desc"), 2, "OCD/Orange-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.3.desc"), 3, "OCD/Orange-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.4.desc"), 4, "OCD/Magenta-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.5.desc"), 5, "OCD/Magenta-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.6.desc"), 6, "OCD/LightBlue-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.7.desc"), 7, "OCD/LightBlue-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.8.desc"), 8, "OCD/Yellow-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.9.desc"), 9, "OCD/Yellow-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.10.desc"), 10, "OCD/Lime-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.11.desc"), 11, "OCD/Lime-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.12.desc"), 12, "OCD/Pink-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.13.desc"), 13, "OCD/Pink-Thin"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.14.desc"), 14, "OCD/Gray-Thick"); + OCD.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD.15.desc"), 15, "OCD/Gray-Thin"); + } + if (Configurations.featureEnabled("OCD2")) + { + OCD2 = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + OCD2.carverHelper.setChiselBlockName("OCD2"); + OCD2.carverHelper.register(OCD2, "OCD2"); + + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.0.desc"), 0, "OCD/LightGray-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.1.desc"), 1, "OCD/LightGray-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.2.desc"), 2, "OCD/Cyan-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.3.desc"), 3, "OCD/Cyan-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.4.desc"), 4, "OCD/Purple-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.5.desc"), 5, "OCD/Purple-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.6.desc"), 6, "OCD/Blue-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.7.desc"), 7, "OCD/Blue-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.8.desc"), 8, "OCD/Brown-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.9.desc"), 9, "OCD/Brown-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.10.desc"), 10, "OCD/Green-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.11.desc"), 11, "OCD/Green-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.12.desc"), 12, "OCD/Red-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.13.desc"), 13, "OCD/Red-Thin"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.14.desc"), 14, "OCD/Black-Thick"); + OCD2.carverHelper.addVariation(StatCollector.translateToLocal("tile.OCD2.15.desc"), 15, "OCD/Black-Thin"); + } } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 8a551f7e..74253742 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1150,6 +1150,43 @@ tile.laboratory.13.desc=Direction Console (Right) tile.laboratory.14.desc=Direction Console (Left) tile.laboratory.15.desc=Information Console +#OCD +tile.OCD.name=OCD Block +tile.OCD.0.desc=White(Thick) +tile.OCD.1.desc=White(Thin) +tile.OCD.2.desc=Orange(Thick) +tile.OCD.3.desc=Orange(Thin) +tile.OCD.4.desc=Magenta(Thick) +tile.OCD.5.desc=Magenta(Thin) +tile.OCD.6.desc=Light Blue(Thick) +tile.OCD.7.desc=Light Blue(Thin) +tile.OCD.8.desc=Yellow(Thick) +tile.OCD.9.desc=Yellow(Thin) +tile.OCD.10.desc=Lime(Thick) +tile.OCD.11.desc=Lime(Thin) +tile.OCD.12.desc=Pink(Thick) +tile.OCD.13.desc=Pink(Thin) +tile.OCD.14.desc=Gray(Thick) +tile.OCD.15.desc=Gray(Thin) +#OCD2 +tile.OCD2.name=OCD Block +tile.OCD2.0.desc=Light Gray(Thick) +tile.OCD2.1.desc=Light Gray(Thin) +tile.OCD2.2.desc=Cyan(Thick) +tile.OCD2.3.desc=Cyan(Thin) +tile.OCD2.4.desc=Purple(Thick) +tile.OCD2.5.desc=Purple(Thin) +tile.OCD2.6.desc=Blue(Thick) +tile.OCD2.7.desc=Blue(Thin) +tile.OCD2.8.desc=Brown(Thick) +tile.OCD2.9.desc=Brown(Thin) +tile.OCD2.10.desc=Green(Thick) +tile.OCD2.11.desc=Green(Thin) +tile.OCD2.12.desc=Red(Thick) +tile.OCD2.13.desc=Red(Thin) +tile.OCD2.14.desc=Black(Thick) +tile.OCD2.15.desc=Black(Thin) + # Creative Tab localizations itemGroup.tabOtherChiselBlocks=Other Chisel Blocks itemGroup.tabStoneChiselBlocks=Stone Chisel Blocks diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Black-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Black-Thick.png new file mode 100644 index 00000000..c1d9e9d1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Black-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Black-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Black-Thin.png new file mode 100644 index 00000000..e3cad73a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Black-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Blue-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Blue-Thick.png new file mode 100644 index 00000000..8b50069f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Blue-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Blue-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Blue-Thin.png new file mode 100644 index 00000000..83cda180 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Blue-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Brown-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Brown-Thick.png new file mode 100644 index 00000000..5ac2b59c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Brown-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Brown-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Brown-Thin.png new file mode 100644 index 00000000..2b46b2ad Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Brown-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Cyan-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Cyan-Thick.png new file mode 100644 index 00000000..10ba4d47 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Cyan-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Cyan-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Cyan-Thin.png new file mode 100644 index 00000000..812b717c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Cyan-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Gray-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Gray-Thick.png new file mode 100644 index 00000000..bc2d4655 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Gray-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Gray-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Gray-Thin.png new file mode 100644 index 00000000..22bb60d0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Gray-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Green-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Green-Thick.png new file mode 100644 index 00000000..6d77f668 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Green-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Green-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Green-Thin.png new file mode 100644 index 00000000..c6fac9dd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Green-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/LightBlue-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/LightBlue-Thick.png new file mode 100644 index 00000000..1daf2e52 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/LightBlue-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/LightBlue-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/LightBlue-Thin.png new file mode 100644 index 00000000..dd6fbd77 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/LightBlue-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/LightGray-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/LightGray-Thick.png new file mode 100644 index 00000000..06647a57 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/LightGray-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/LightGray-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/LightGray-Thin.png new file mode 100644 index 00000000..7d63081c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/LightGray-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Lime-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Lime-Thick.png new file mode 100644 index 00000000..4eab7c24 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Lime-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Lime-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Lime-Thin.png new file mode 100644 index 00000000..d44448cf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Lime-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Magenta-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Magenta-Thick.png new file mode 100644 index 00000000..72514f32 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Magenta-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Magenta-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Magenta-Thin.png new file mode 100644 index 00000000..c6bfe3ee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Magenta-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Orange-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Orange-Thick.png new file mode 100644 index 00000000..f1fae097 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Orange-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Orange-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Orange-Thin.png new file mode 100644 index 00000000..de68c811 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Orange-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Pink-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Pink-Thick.png new file mode 100644 index 00000000..dbfff584 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Pink-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Pink-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Pink-Thin.png new file mode 100644 index 00000000..a62d0519 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Pink-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Purple-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Purple-Thick.png new file mode 100644 index 00000000..ccec63a3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Purple-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Purple-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Purple-Thin.png new file mode 100644 index 00000000..926b5f41 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Purple-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Red-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Red-Thick.png new file mode 100644 index 00000000..f83189d1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Red-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Red-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Red-Thin.png new file mode 100644 index 00000000..992c0067 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Red-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/White-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/White-Thick.png new file mode 100644 index 00000000..ef0f31f5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/White-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/White-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/White-Thin.png new file mode 100644 index 00000000..222904ef Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/White-Thin.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Yellow-Thick.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Yellow-Thick.png new file mode 100644 index 00000000..72320e06 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Yellow-Thick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/OCD/Yellow-Thin.png b/src/main/resources/assets/chisel/textures/blocks/OCD/Yellow-Thin.png new file mode 100644 index 00000000..af808cbf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/OCD/Yellow-Thin.png differ