diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 380ee68d..dc8a1f8b 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -624,7 +624,14 @@ public enum Features { void addBlocks() { BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); Carving.chisel.addVariation("end_Stone", Blocks.end_stone , 0, -1); - end_Stone.carverHelper.addVariation("tile.endstone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.1.desc", 1, "endstone/chaoticBricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.2.desc", 2, "endstone/CheckeredTile"); + end_Stone.carverHelper.addVariation("tile.end_Stone.3.desc", 3, "endstone/enderCircuit"); + end_Stone.carverHelper.addVariation("tile.end_Stone.4.desc", 4, "endstone/endFrenchBricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.5.desc", 5, "endstone/endPillar"); + end_Stone.carverHelper.addVariation("tile.end_Stone.6.desc", 6, "endstone/endStoneEtched"); + end_Stone.carverHelper.addVariation("tile.end_Stone.7.desc", 7, "endstone/prismaticEndStone"); end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); Carving.chisel.registerOre("end_Stone", "end_Stone"); } @@ -1901,6 +1908,12 @@ public enum Features { BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); purpur.carverHelper.addVariation("tile.purpur.0.desc", 0, "end_purpur/purpur_block"); purpur.carverHelper.addVariation("tile.purpur.1.desc", 1, "end_purpur/purpur_pillar"); + purpur.carverHelper.addVariation("tile.purpur.2.desc", 2, "end_purpur/shulker"); + purpur.carverHelper.addVariation("tile.purpur.3.desc", 3, "end_purpur/tilePurpur"); + purpur.carverHelper.addVariation("tile.purpur.4.desc", 4, "end_purpur/tileBrokenPurpur"); + purpur.carverHelper.addVariation("tile.purpur.5.desc", 5, "end_purpur/prismaticPurpur"); + purpur.carverHelper.addVariation("tile.purpur.6.desc", 6, "end_purpur/purpurBricks"); + purpur.carverHelper.addVariation("tile.purpur.7.desc", 7, "end_purpur/purpurCobble"); purpur.carverHelper.registerAll(purpur, "purpur"); Carving.chisel.registerOre("purpur", "purpur"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 90a98cfb..5d5c6c91 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -356,6 +356,28 @@ tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Tape Drive? (I'm too young for this.) +#End Stone +tile.chisel.end_Stone.name=End Stone +tile.end_Stone.0.name=End Stone Bricks +tile.end_Stone.1.name=End Chaotic Bricks +tile.end_Stone.2.name=Checkered Tiles +tile.end_Stone.3.name=Ender Circuit +tile.end_Stone.4.name=Fancy Bricks +tile.end_Stone.5.name=End Stone Pillar +tile.end_Stone.6.name=Etched End Stone +tile.end_Stone.7.name=Prismatic End Stone + +#Purpur +tile.chisel.purpur.name=Purpur +tile.purpur.0.name=Medium Tiles +tile.purpur.1.name=Pillar +tile.purpur.2.name=Not Shulker +tile.purpur.3.name=Small Tiles +tile.purpur.4.name=Broken Small Tiles +tile.purpur.5.name=Prismatic Purpur +tile.purpur.6.name=Rough Bricks +tile.purpur.7.name=Cracked Surface + #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum tile.chisel.bronzeblock.name=Block of Bronze diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png new file mode 100644 index 00000000..f5f16850 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurBricks.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurBricks.png new file mode 100644 index 00000000..bd1a2715 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurBricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png new file mode 100644 index 00000000..de76e646 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-side.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-side.png new file mode 100644 index 00000000..177ac788 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-top.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-top.png new file mode 100644 index 00000000..1d29ef54 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png new file mode 100644 index 00000000..445bb9bb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png new file mode 100644 index 00000000..746e2dfb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png new file mode 100644 index 00000000..a07a639b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png b/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png new file mode 100644 index 00000000..2c0f4468 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png new file mode 100644 index 00000000..089cd8ec Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png new file mode 100644 index 00000000..94ac7259 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png new file mode 100644 index 00000000..60008c3a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png new file mode 100644 index 00000000..7410b52b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png new file mode 100644 index 00000000..680dc919 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png b/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png new file mode 100644 index 00000000..0b38ce66 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png b/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png new file mode 100644 index 00000000..8e1e5ea8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png differ