diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index 292bf8cc..fc2b8566 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -63,6 +63,7 @@ public class ChiselBlocks public static BlockCarvable blockFactory; public static BlockCarvablePane blockPaperwall; public static BlockCarvable blockWoolenClay; + public static BlockCarvable blockLaboratory; public static BlockSnakestone blockSnakestone; public static BlockSnakestone blockSandSnakestone; @@ -1225,6 +1226,29 @@ public class ChiselBlocks } + if(Configurations.featureEnabled("laboratory")) + { + blockLaboratory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + blockLaboratory.carverHelper.setChiselBlockName("blockLaboratory"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.0.desc"), 0, "laboratory/wallpanel"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.1.desc"), 1, "laboratory/dottedpanel"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.2.desc"), 2, "laboratory/largewall"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.3.desc"), 3, "laboratory/roundel"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.4.desc"), 4, "laboratory/wallvents"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.5.desc"), 5, "laboratory/largetile"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.6.desc"), 6, "laboratory/smalltile"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.7.desc"), 7, "laboratory/floortile"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.8.desc"), 8, "laboratory/checkertile"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.9.desc"), 9, "laboratory/clearscreen"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.10.desc"),10, "laboratory/fuzzscreen"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.11.desc"),11,"laboratory/largesteel"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.12.desc"),12,"laboratory/smallsteel"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.13.desc"),13,"laboratory/directionright"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.14.desc"),14,"laboratory/directionleft"); + blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.15.desc"),15,"laboratory/infocon"); + blockLaboratory.carverHelper.register(blockLaboratory, "blockLaboratory"); + } + Blocks.stone.setHarvestLevel("chisel", 0, 0); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index 8bf4bcad..a7ca59b2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -76,6 +76,7 @@ public class Crafting GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.blockWoolenClay, 2, i), new Object[] {"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")})); } + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLaboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)}); } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index eb00d437..46468d16 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -701,6 +701,24 @@ chisel.tile.woolenClay.13.desc=Green Woolen Clay chisel.tile.woolenClay.14.desc=Red Woolen Clay chisel.tile.woolenClay.15.desc=Black Woolen Clay +#Laboratory Block +chisel.tile.blockLaboratory.name=Laboratory Block +chisel.tile.blockLaboratory.0.desc=Wall Panel +chisel.tile.blockLaboratory.1.desc=Dotted Panel +chisel.tile.blockLaboratory.2.desc=Enameled Wall +chisel.tile.blockLaboratory.3.desc=Enameled Roundel Wall +chisel.tile.blockLaboratory.4.desc=Enameled Wall Vents +chisel.tile.blockLaboratory.5.desc=Large Enameled Tile +chisel.tile.blockLaboratory.6.desc=Small Enameled Tiles +chisel.tile.blockLaboratory.7.desc=Laboratory Floor +chisel.tile.blockLaboratory.8.desc=Checkerboard Floor +chisel.tile.blockLaboratory.9.desc=Clear Panel +chisel.tile.blockLaboratory.10.desc=Fuzzy Panel +chisel.tile.blockLaboratory.11.desc=Large Steel Tile +chisel.tile.blockLaboratory.12.desc=Small Steel Tiles +chisel.tile.blockLaboratory.13.desc=Direction Console (Right) +chisel.tile.blockLaboratory.14.desc=Direction Console (Left) +chisel.tile.blockLaboratory.15.desc=Information Console # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/checkertile.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/checkertile.png new file mode 100644 index 00000000..e7f2fc60 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/checkertile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/clearscreen-ctm.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/clearscreen-ctm.png new file mode 100644 index 00000000..639c64ed Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/clearscreen-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/clearscreen.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/clearscreen.png new file mode 100644 index 00000000..76699255 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/clearscreen.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/directionleft-ctmh.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionleft-ctmh.png new file mode 100644 index 00000000..952a0922 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionleft-ctmh.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/directionleft-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionleft-top.png new file mode 100644 index 00000000..5334068c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionleft-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/directionright-ctmh.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionright-ctmh.png new file mode 100644 index 00000000..c449269b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionright-ctmh.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/directionright-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionright-top.png new file mode 100644 index 00000000..5334068c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/directionright-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/dottedpanel-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/dottedpanel-ctmv.png new file mode 100644 index 00000000..fe1ef1c3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/dottedpanel-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/dottedpanel-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/dottedpanel-top.png new file mode 100644 index 00000000..f102d11d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/dottedpanel-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/floortile.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/floortile.png new file mode 100644 index 00000000..71624dee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/floortile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/fuzzscreen-ctm.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/fuzzscreen-ctm.png new file mode 100644 index 00000000..c1d4e3d0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/fuzzscreen-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/fuzzscreen.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/fuzzscreen.png new file mode 100644 index 00000000..910bf681 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/fuzzscreen.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/infocon-ctmh.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/infocon-ctmh.png new file mode 100644 index 00000000..40ef0659 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/infocon-ctmh.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/infocon-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/infocon-top.png new file mode 100644 index 00000000..5334068c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/infocon-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/largesteel-side.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/largesteel-side.png new file mode 100644 index 00000000..bfd5ec9e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/largesteel-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/largesteel-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/largesteel-top.png new file mode 100644 index 00000000..8845e46f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/largesteel-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/largetile.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/largetile.png new file mode 100644 index 00000000..2562cfbd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/largetile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/largewall-ctm.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/largewall-ctm.png new file mode 100644 index 00000000..8e8d90b8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/largewall-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/largewall.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/largewall.png new file mode 100644 index 00000000..63eba14e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/largewall.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/roundel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/roundel-ctm.png new file mode 100644 index 00000000..504dc4ea Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/roundel-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/roundel.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/roundel.png new file mode 100644 index 00000000..ce8f0eb7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/roundel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/smallsteel-side.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/smallsteel-side.png new file mode 100644 index 00000000..e885a214 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/smallsteel-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/smallsteel-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/smallsteel-top.png new file mode 100644 index 00000000..4a772a82 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/smallsteel-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/smalltile.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/smalltile.png new file mode 100644 index 00000000..0d855284 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/smalltile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/wallpanel-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallpanel-ctmv.png new file mode 100644 index 00000000..3bd98c89 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallpanel-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/wallpanel-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallpanel-top.png new file mode 100644 index 00000000..f24740ca Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallpanel-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/wallvents-ctmh.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallvents-ctmh.png new file mode 100644 index 00000000..055b206a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallvents-ctmh.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/laboratory/wallvents-top.png b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallvents-top.png new file mode 100644 index 00000000..5334068c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/laboratory/wallvents-top.png differ