diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 84b09e90..17442b6c 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1568,11 +1568,14 @@ public class ModBlocks { arcane = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.0.desc"), 0, "arcane/ArcaneMoon"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 1, "arcane/ArcaneMoonGlow"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.0.desc"), 0, "arcane/moonEngrave"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 1, "arcane/moonGlowAnim"); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 2, "arcane/arcaneTile"); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 3, "arcane/runes"); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.4.desc"), 4, "arcane/runesGlow"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.5.desc"), 5, "arcane/arcaneBrickNoNoNo"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.6.desc"), 6, "arcane/conduitAnim"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.7.desc"), 7, "arcane/BorderBrain"); arcane.carverHelper.register(arcane, "arcane"); Carving.chisel.registerOre("arcane", "arcane"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index b7215254..763fad5a 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -76,9 +76,12 @@ tile.voidstonePillar2.0.desc=Striped Energised Voidstone Pillar tile.arcane.name=Arcane Stone Block tile.arcane.0.desc=Engraved Moon tile.arcane.1.desc=Glowing Moon -tile.arcane.2.desc=Large Tile with Border +tile.arcane.2.desc=Beveled Tile tile.arcane.3.desc=Engraved Symbols tile.arcane.4.desc=Glowing Symbols +tile.arcane.5.desc=Bricks (WIP) +tile.arcane.6.desc=Vis Conduit +tile.arcane.7.desc=Braaainz #Waterstone tile.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/BorderBrain-ctm.png b/src/main/resources/assets/chisel/textures/blocks/arcane/BorderBrain-ctm.png new file mode 100644 index 00000000..835cb6a5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/BorderBrain-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneMoonGlow.png b/src/main/resources/assets/chisel/textures/blocks/arcane/BorderBrain.png similarity index 79% rename from src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneMoonGlow.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/BorderBrain.png index 1ee6586f..b0430bfd 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneMoonGlow.png and b/src/main/resources/assets/chisel/textures/blocks/arcane/BorderBrain.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrick-ctmh.png b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrick-ctmh.png new file mode 100644 index 00000000..0a57ed1c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrick-ctmh.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneMoon.png b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrickNoNoNo.png similarity index 80% rename from src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneMoon.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrickNoNoNo.png index de1c3d79..12711d35 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneMoon.png and b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrickNoNoNo.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png new file mode 100644 index 00000000..6ec0a834 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png.mcmeta new file mode 100644 index 00000000..1a9420f9 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png b/src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png deleted file mode 100644 index 36f73b01..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/arcane/moon-thaumium.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moon.png b/src/main/resources/assets/chisel/textures/blocks/arcane/moon.png deleted file mode 100644 index 9fe98a63..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/arcane/moon.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moonEngrave.png b/src/main/resources/assets/chisel/textures/blocks/arcane/moonEngrave.png new file mode 100644 index 00000000..020e79dd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/moonEngrave.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moonGlowAnim.png b/src/main/resources/assets/chisel/textures/blocks/arcane/moonGlowAnim.png new file mode 100644 index 00000000..4479f94a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/moonGlowAnim.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/moonGlowAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/arcane/moonGlowAnim.png.mcmeta new file mode 100644 index 00000000..1a9420f9 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/arcane/moonGlowAnim.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file