diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index eef5eff8..e2935602 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -5120,8 +5120,8 @@ public enum Features { amber2.carverHelper.addVariation("tile.gemstones.8.desc", 8, "amber/amberSmooth"); amber2.carverHelper.addVariation("tile.gemstones.9.desc", 9, "amber/amberSpiral"); amber2.carverHelper.addVariation("tile.gemstones.10.desc", 10, "amber/amberTiles"); - amber2.carverHelper.registerAll(amber2, "amber"); - Carving.chisel.registerOre("amber", "amberBlock"); + amber2.carverHelper.registerAll(amber2, "amber2"); + Carving.chisel.registerOre("amber2", "amberBlock"); } }, JADE { @@ -5316,6 +5316,30 @@ public enum Features { Carving.chisel.registerOre("onyx", "onyxBlock"); } }, + APATITE { + + @Override + void addBlocks() { + BlockCarvable apatite = (BlockBeaconBase) new BlockBeaconBase() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeMetal); + apatite.carverHelper.addVariation("tile.gemstones.0.desc", 0, "apatite/apatiteBismuth"); + apatite.carverHelper.addVariation("tile.gemstones.1.desc", 1, "apatite/apatiteBordered"); + apatite.carverHelper.addVariation("tile.gemstones.2.desc", 2, "apatite/apatiteCell"); + apatite.carverHelper.addVariation("tile.gemstones.3.desc", 3, "apatite/apatiteFacet"); + apatite.carverHelper.addVariation("tile.gemstones.4.desc", 4, "apatite/apatiteOrnate"); + apatite.carverHelper.addVariation("tile.gemstones.5.desc", 5, "apatite/apatitePanel"); + apatite.carverHelper.addVariation("tile.gemstones.6.desc", 6, "apatite/apatitePolished"); + apatite.carverHelper.addVariation("tile.gemstones.7.desc", 7, "apatite/apatiteRaw"); + apatite.carverHelper.addVariation("tile.gemstones.8.desc", 8, "apatite/apatiteSmooth"); + apatite.carverHelper.addVariation("tile.gemstones.9.desc", 9, "apatite/apatiteSpiral"); + apatite.carverHelper.addVariation("tile.gemstones.10.desc", 10, "apatite/apatiteTiles"); + apatite.carverHelper.registerAll(apatite, "apatite"); + Carving.chisel.registerOre("apatite", "apatiteBlock"); + } + }, PLASTICBLOCK { @Override diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 0c7eb0b5..fa503815 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -213,6 +213,7 @@ public final class ChiselBlocks { public static final BlockCarvable labradorite = null; public static final BlockCarvable onyx = null; public static final BlockCarvable plasticblock = null; + public static final BlockCarvable apatite = 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 5097990e..05114a22 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -2810,6 +2810,7 @@ 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.chisel.apatite.name=Topaz tile.gemstones.0.desc=Bismuth tile.gemstones.1.desc=Bordered diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteBismuth.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteBismuth.png new file mode 100644 index 00000000..310046be Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteBismuth.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteBordered.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteBordered.png new file mode 100644 index 00000000..fbb3e17d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteBordered.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteCell.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteCell.png new file mode 100644 index 00000000..28e5a355 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteCell.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteFacet.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteFacet.png new file mode 100644 index 00000000..383116d7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteFacet.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteOrnate.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteOrnate.png new file mode 100644 index 00000000..7797d04b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteOrnate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatitePanel.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatitePanel.png new file mode 100644 index 00000000..840a1099 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatitePanel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatitePolished.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatitePolished.png new file mode 100644 index 00000000..2421e398 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatitePolished.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteRaw.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteRaw.png new file mode 100644 index 00000000..6ce0065a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteRaw.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteSmooth.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteSmooth.png new file mode 100644 index 00000000..c1e3dcd8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteSmooth.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteSpiral.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteSpiral.png new file mode 100644 index 00000000..0ad4820a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteSpiral.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteTiles.png b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteTiles.png new file mode 100644 index 00000000..f51bd936 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/apatite/apatiteTiles.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBismuth.png b/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBismuth.png deleted file mode 100644 index 8fcd3087..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBismuth.png and /dev/null 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 deleted file mode 100644 index 60ff9b87..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineBorder.png and /dev/null 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 deleted file mode 100644 index ed1dcd6f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineCell.png and /dev/null 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 deleted file mode 100644 index ee965e0a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineFacet.png and /dev/null 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 deleted file mode 100644 index 5c6d479d..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineOrnate.png and /dev/null 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 deleted file mode 100644 index e506c3cd..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePanel.png and /dev/null 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 deleted file mode 100644 index 435cdd42..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrinePolished.png and /dev/null 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 deleted file mode 100644 index 80324aa5..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineRaw.png and /dev/null 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 deleted file mode 100644 index 62761846..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSmooth.png and /dev/null 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 deleted file mode 100644 index 11cde8a7..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineSpiral.png and /dev/null 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 deleted file mode 100644 index f89ca765..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/citrine/citrineTiles.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazBismuth.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazBismuth.png deleted file mode 100644 index 8fcd3087..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazBismuth.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazBorder.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazBorder.png deleted file mode 100644 index 60ff9b87..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazBorder.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazCell.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazCell.png deleted file mode 100644 index ed1dcd6f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazCell.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazFacet.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazFacet.png deleted file mode 100644 index ee965e0a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazFacet.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazOrnate.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazOrnate.png deleted file mode 100644 index 5c6d479d..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazOrnate.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazPanel.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazPanel.png deleted file mode 100644 index e506c3cd..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazPanel.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazPolished.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazPolished.png deleted file mode 100644 index 435cdd42..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazPolished.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazRaw.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazRaw.png deleted file mode 100644 index 80324aa5..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazRaw.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazSmooth.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazSmooth.png deleted file mode 100644 index 62761846..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazSmooth.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazSpiral.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazSpiral.png deleted file mode 100644 index 11cde8a7..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazSpiral.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazTiles.png b/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazTiles.png deleted file mode 100644 index f89ca765..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/nopaz/nopazTiles.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain0.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain0.png new file mode 100644 index 00000000..8bae1294 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain1.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain1.png new file mode 100644 index 00000000..9882b0fc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain10.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain10.png new file mode 100644 index 00000000..048d2573 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain10.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain11.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain11.png new file mode 100644 index 00000000..63f1623d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain11.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain12.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain12.png new file mode 100644 index 00000000..8e078064 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain12.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain13.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain13.png new file mode 100644 index 00000000..c9d45f5b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain13.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain2.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain2.png new file mode 100644 index 00000000..b120260d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain3.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain3.png new file mode 100644 index 00000000..31f603a9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain4.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain4.png new file mode 100644 index 00000000..699a09d1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain5.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain5.png new file mode 100644 index 00000000..ae99f29f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain6-side.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain6-side.png new file mode 100644 index 00000000..35e043eb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain6-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain6-top.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain6-top.png new file mode 100644 index 00000000..00572f15 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain6-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain7.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain7.png new file mode 100644 index 00000000..9f8aeaac Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain9-side.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain9-side.png new file mode 100644 index 00000000..3288a716 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain9-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain9-top.png b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain9-top.png new file mode 100644 index 00000000..88a4bc22 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/porcelain/porcelain9-top.png differ