diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 96e21abc..eef5eff8 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -5315,6 +5315,36 @@ public enum Features { onyx.carverHelper.registerAll(onyx, "onyx"); Carving.chisel.registerOre("onyx", "onyxBlock"); } + }, + PLASTICBLOCK { + + @Override + void addBlocks() { + BlockCarvable plasticblock = (BlockCarvable) new BlockCarvable(Material.iron) + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1.0F) + .setResistance(5F) + .setStepSound(Block.soundTypeStone); + + plasticblock.carverHelper.addVariation("tile.plastic.0.desc", 0, "plastic/plastic0"); + plasticblock.carverHelper.addVariation("tile.plastic.1.desc", 1, "plastic/plastic1"); + plasticblock.carverHelper.addVariation("tile.plastic.2.desc", 2, "plastic/plastic2"); + plasticblock.carverHelper.addVariation("tile.plastic.3.desc", 3, "plastic/plastic3"); + plasticblock.carverHelper.addVariation("tile.plastic.4.desc", 4, "plastic/plastic4"); + plasticblock.carverHelper.addVariation("tile.plastic.5.desc", 5, "plastic/plastic5"); + plasticblock.carverHelper.addVariation("tile.plastic.6.desc", 6, "plastic/plastic6"); + plasticblock.carverHelper.addVariation("tile.plastic.7.desc", 7, "plastic/plastic7"); + plasticblock.carverHelper.addVariation("tile.plastic.8.desc", 8, "plastic/plastic8"); + plasticblock.carverHelper.addVariation("tile.plastic.9.desc", 9, "plastic/plastic9"); + plasticblock.carverHelper.addVariation("tile.plastic.10.desc", 10, "plastic/plastic10"); + plasticblock.carverHelper.addVariation("tile.plastic.11.desc", 11, "plastic/plastic11"); + plasticblock.carverHelper.addVariation("tile.plastic.12.desc", 12, "plastic/plastic12"); + plasticblock.carverHelper.addVariation("tile.plastic.13.desc", 13, "plastic/plastic13"); + plasticblock.carverHelper.addVariation("tile.plastic.14.desc", 14, "plastic/plastic14"); + plasticblock.carverHelper.addVariation("tile.plastic.15.desc", 15, "plastic/plastic15"); + plasticblock.carverHelper.registerAll(plasticblock, "plasticblock"); + Carving.chisel.registerOre("plasticblock", "plasticblock"); + } }; private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index ea929ea0..0c7eb0b5 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -212,6 +212,7 @@ public final class ChiselBlocks { public static final BlockCarvable netherquartz = null; public static final BlockCarvable labradorite = null; public static final BlockCarvable onyx = null; + public static final BlockCarvable plasticblock = null; private ChiselBlocks() {} } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 99c4ccd3..5097990e 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -2809,6 +2809,7 @@ tile.chisel.rhodochrosite.name=Block of Rhodochrosite tile.chisel.netherquartz.name=Block of Nether Quartz tile.chisel.labradorite.name=Block of Labradorite tile.chisel.onyx.name=Block of Onyx +tile.chisel.plasticblock.name=Plastic tile.gemstones.0.desc=Bismuth tile.gemstones.1.desc=Bordered @@ -2822,5 +2823,22 @@ tile.gemstones.8.desc=Smooth tile.gemstones.9.desc=Hopper Crystal tile.gemstones.10.desc=Simple Tiles +tile.plastic.0.desc=Polyethylene Sheets +tile.plastic.1.desc=Polyvinyl Chloride Pipes +tile.plastic.2.desc=Polytetrafluoroethylene Bricks +tile.plastic.3.desc=Polybenzimidazole Grates +tile.plastic.4.desc=Kevlar Netting +tile.plastic.5.desc=Epoxy Resin Bubbles +tile.plastic.6.desc=Radox Polymer Casings +tile.plastic.7.desc=Red Nondescript Plastic Brick +tile.plastic.8.desc=Orange Nondescript Plastic Brick +tile.plastic.9.desc=Yellow Nondescript Plastic Brick +tile.plastic.10.desc=Green Nondescript Plastic Brick +tile.plastic.11.desc=Blue Nondescript Plastic Brick +tile.plastic.12.desc=Purple Nondescript Plastic Brick +tile.plastic.13.desc=Gray Nondescript Plastic Brick +tile.plastic.14.desc=Black Nondescript Plastic Brick +tile.plastic.15.desc=White Nondescript Plastic Brick + tile.chisel.amber.name=Block of Amber tile.chisel.bloodBrick.name=Bloodstone Brick diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBismuth.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBismuth.png new file mode 100644 index 00000000..8fcd3087 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBismuth.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBorder.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBorder.png new file mode 100644 index 00000000..60ff9b87 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBorder.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineCell.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineCell.png new file mode 100644 index 00000000..ed1dcd6f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineCell.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineFacet.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineFacet.png new file mode 100644 index 00000000..ee965e0a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineFacet.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineOrnate.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineOrnate.png new file mode 100644 index 00000000..5c6d479d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineOrnate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePanel.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePanel.png new file mode 100644 index 00000000..e506c3cd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePanel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePolished.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePolished.png new file mode 100644 index 00000000..435cdd42 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePolished.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineRaw.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineRaw.png new file mode 100644 index 00000000..80324aa5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineRaw.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSmooth.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSmooth.png new file mode 100644 index 00000000..62761846 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSmooth.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSpiral.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSpiral.png new file mode 100644 index 00000000..11cde8a7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSpiral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineTiles.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineTiles.png new file mode 100644 index 00000000..f89ca765 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineTiles.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic0-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic0-ctm.png new file mode 100644 index 00000000..5fb68925 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic0-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic0.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic0.png new file mode 100644 index 00000000..02c61fb6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic1-ctm.png new file mode 100644 index 00000000..d5f2fae7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic1-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic1.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic1.png new file mode 100644 index 00000000..802e1a61 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-bottom.png new file mode 100644 index 00000000..1344fc88 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-side.png new file mode 100644 index 00000000..0179d68c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-top.png new file mode 100644 index 00000000..dd1c56ec Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic10-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-bottom.png new file mode 100644 index 00000000..059f8b2b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-side.png new file mode 100644 index 00000000..017b7f7b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-top.png new file mode 100644 index 00000000..c1316f17 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic11-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-bottom.png new file mode 100644 index 00000000..b5a5118d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-side.png new file mode 100644 index 00000000..fe1d5b22 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-top.png new file mode 100644 index 00000000..342d9d31 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic12-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-bottom.png new file mode 100644 index 00000000..c667e0e7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-side.png new file mode 100644 index 00000000..ecae65e6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-top.png new file mode 100644 index 00000000..10dfcc50 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic13-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-bottom.png new file mode 100644 index 00000000..19d81966 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-side.png new file mode 100644 index 00000000..bc23a153 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-top.png new file mode 100644 index 00000000..4f719ce4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic14-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic15-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic15-side.png new file mode 100644 index 00000000..1f8c9c61 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic15-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic15-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic15-top.png new file mode 100644 index 00000000..2b2fe207 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic15-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic2-ctm.png new file mode 100644 index 00000000..903c4d4c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic2.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic2.png new file mode 100644 index 00000000..0bc0916f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic3-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic3-ctm.png new file mode 100644 index 00000000..001719e4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic3-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic3.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic3.png new file mode 100644 index 00000000..e52c5eeb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic4-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic4-ctm.png new file mode 100644 index 00000000..d0ec1342 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic4-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic4.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic4.png new file mode 100644 index 00000000..200c01c7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic5-ctm.png new file mode 100644 index 00000000..686ee161 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic5-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic5.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic5.png new file mode 100644 index 00000000..cbe7f186 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic6-ctm.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic6-ctm.png new file mode 100644 index 00000000..4924be73 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic6-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic6.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic6.png new file mode 100644 index 00000000..caa41980 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-bottom.png new file mode 100644 index 00000000..53e297ba Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-side.png new file mode 100644 index 00000000..077e9e96 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-top.png new file mode 100644 index 00000000..4b7043df Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic7-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-bottom.png new file mode 100644 index 00000000..9a220a42 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-side.png new file mode 100644 index 00000000..f3ddd4cf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-top.png new file mode 100644 index 00000000..d51b9aa9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic8-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-bottom.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-bottom.png new file mode 100644 index 00000000..69ee770a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-side.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-side.png new file mode 100644 index 00000000..65c8e5c6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-top.png b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-top.png new file mode 100644 index 00000000..6e294ae4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/plastic/plastic9-top.png differ