diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index df2d3433..3e5de2f7 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -22,6 +22,7 @@ import com.google.common.collect.Lists; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -166,7 +167,7 @@ public enum Features { arcane.carverHelper.addVariation("tile.arcane.8.desc", 8, "arcane/ArcaneBorder"); arcane.carverHelper.addVariation("tile.arcane.9.desc", 9, "arcane/arcaneMatrix"); arcane.carverHelper.addVariation("tile.arcane.10.desc", 10, "arcane/thaumcraftLogo"); - arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/entropiedEntritchRock"); + arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/arcaneCrackAnim"); arcane.carverHelper.registerAll(arcane, "arcane"); Carving.chisel.registerOre("arcane", "arcane"); } @@ -784,11 +785,7 @@ public enum Features { // Looks like an AE Controller, feels like one, even lags like one! BlockSnakestone FalsettoAE = (BlockSnakestone) new BlockSnakestone("Chisel:futura/controllerHack/").setBlockName("chisel.fakeController").setCreativeTab(ChiselTabs.tabMetalChiselBlocks); GameRegistry.registerBlock(FalsettoAE, ItemCarvable.class, "FalsettoAE"); - // LanguageRegistry.addName(new ItemStack(snakestone, 1, 1), - // "Stone snake block head"); - // LanguageRegistry.addName(new ItemStack(snakestone, 1, 13), - // "Stone snake block body"); - // Carving.chisel.addVariation("futura", FalsettoAE, 1, 67); // Real AE controllers don't have heads! + Carving.chisel.addVariation("futura", FalsettoAE, 1, 67); Carving.chisel.addVariation("futura", FalsettoAE, 13, 68); circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 36d34711..8f89e102 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -225,7 +225,7 @@ tile.bloodRune.5.desc=Blood Rune Tiles #Futura tile.chisel.futura.name=Futura Block tile.chisel.futuraCircuit.name=Futura Circuit -chisel.fakeController.name=ME Controller? +tile.chisel.fakeController.name=ME Controller? tile.futura.0.desc=Glowing Screen with Metallic Borders tile.futura.1.desc=Glowing Screen with Cyan Borders tile.futura.2.desc=Applied Labyrinthic Neon Lines diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneCrackAnim-v9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneCrackAnim-v9.png new file mode 100644 index 00000000..b31b0134 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneCrackAnim-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneCrackAnim-v9.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneCrackAnim-v9.png.mcmeta new file mode 100644 index 00000000..64e0d8e0 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneCrackAnim-v9.png.mcmeta @@ -0,0 +1,24 @@ +{ + "animation": { + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1, + ] + } +} diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/entropiedEntritchRock-v9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/entropiedEntritchRock-v9.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/entropiedEntritchRock-v9.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/entropiedEntritchRock-v9.png