diff --git a/.gitignore b/.gitignore index 6981a5f7..e0cc2c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ bin *.ipr *.iws out +classes #gradle build diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index e5f14b4a..9271b3a5 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -95,6 +95,17 @@ public enum Features { aluminum.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted", 25); aluminum.carverHelper.registerAll(aluminum, "aluminumblock"); Carving.chisel.registerOre("aluminumblock", "blockAluminum"); + + CarvableStairsMaker aluminumStairs = new CarvableStairsMaker(aluminum); + + aluminumStairs.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/aluminum/thermal"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/aluminum/adv"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/aluminum/egregious"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted"); + aluminumStairs.create("aluminum_stairs", ChiselBlocks.aluminumStairs); + Carving.chisel.registerOre("aluminum_stairs", "aluminum_stairs"); } }, @@ -805,9 +816,10 @@ public enum Features { BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); futura.carverHelper.addVariation("tile.futura.0.desc", 0, "futura/WIP/screenMetallicWIP"); futura.carverHelper.addVariation("tile.futura.1.desc", 1, "futura/WIP/screenCyanWIP"); - futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controllerWIP-Overlay", new SubmapManagerFakeController(2)); + futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controller", new SubmapManagerFakeController(2, "futura/WIP/controller")); futura.carverHelper.addVariation("tile.futura.3.desc", 3, "futura/WIP/wavyWIP"); - futura.carverHelper.addVariation("tile.futura.4.desc", 4, "futura/WIP/controllerWIP-Overlay", new SubmapManagerFakeController(4)); + futura.carverHelper.addVariation("tile.futura.4.desc", 4, "futura/WIP/controller", new SubmapManagerFakeController(4, "futura/WIP/controllerPurple")); + futura.carverHelper.addVariation("tile.futura.5.desc", 5, "futura/WIP/controller", new SubmapManagerFakeController(5, "futura/WIP/uberWavy")); futura.carverHelper.registerAll(futura, "futura"); BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); diff --git a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java index dea80570..f4e2074a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java @@ -1,5 +1,6 @@ package com.cricketcraft.chisel.block; +import com.cricketcraft.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -30,7 +31,7 @@ public class CarvableStairsMaker { String n = name + "." + i; blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) : creator.create(blockBase, i * 2, carverHelper); - blocks[i].setBlockName("chisel." + n); + blocks[i].setBlockName("chisel." + n).setCreativeTab(ChiselTabs.tabStairChiselBlocks); GameRegistry.registerBlock(blocks[i], ItemCarvable.class, n); for (int meta = 0; meta < 2 && i * 2 + meta < carverHelper.infoList.size(); meta++) { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java index b3f86484..b8438269 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java @@ -1,5 +1,6 @@ package com.cricketcraft.chisel.client.render; +import com.cricketcraft.chisel.Chisel; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -19,6 +20,13 @@ public class SubmapManagerFakeController extends SubmapManagerBase { private TextureSubmap map; private CTM ctm = CTM.getInstance(); private int meta; + private String texturePath; + + public SubmapManagerFakeController(int meta, String texture) { + ctm.disableObscuredFaceCheck = true; + this.meta = meta; + texturePath = texture; + } public SubmapManagerFakeController(int meta) { ctm.disableObscuredFaceCheck = true; @@ -31,9 +39,11 @@ public class SubmapManagerFakeController extends SubmapManagerBase { } @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) + { ctm.buildConnectionMap(world, x, y, z, side, ChiselBlocks.futura, meta); - if (ctm.connectedAnd(TOP, BOTTOM, LEFT, RIGHT)) { + + if (ctm.connectedAnd(TOP, TOP_RIGHT, RIGHT, BOTTOM_RIGHT, BOTTOM, BOTTOM_LEFT, LEFT, TOP_LEFT)) { return map.getSubIcon(1, 1); } else if (ctm.connectedAnd(TOP, BOTTOM)) { return map.getSubIcon(0, 1); @@ -47,10 +57,16 @@ public class SubmapManagerFakeController extends SubmapManagerBase { @Override @SideOnly(Side.CLIENT) public void registerIcons(String modName, Block block, IIconRegister register) { - if(meta == 2){ - map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); - } else { - map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controllerPurple"), 2, 2); - } + + if (texturePath != null) + { + map = new TextureSubmap(register.registerIcon(modName + ":" + texturePath), 2, 2); + } + else + { + Chisel.logger.info("SubmapManagerFakeController was called on block " + block.getUnlocalizedName() + + " without declaring texture, using a default texture instead."); + map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); + } } } diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 124f293a..ead9941b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -92,6 +92,7 @@ public final class ChiselBlocks { public static final BlockCarvable copperblock = null; public static final BlockCarvable bronzeblock = null; public static final BlockCarvable aluminumblock = null; + public static BlockCarvableStairs[] aluminumStairs = new BlockCarvableStairs[8]; public static final BlockCarvable leadblock = null; public static final BlockCarvable silverblock = null; public static final BlockCarvable steelblock = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index c27a2b1b..24064a51 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -66,6 +66,7 @@ public class ChiselTabs { public static final CustomCreativeTab tabMetalChiselBlocks = new CustomCreativeTab("tabMetalChiselBlocks", true); public static final CustomCreativeTab tabOtherChiselBlocks = new CustomCreativeTab("tabOtherChiselBlocks", true); public static final CustomCreativeTab tabModdedChiselBlocks = new CustomCreativeTab("tabModdedChiselBlocks", true); + public static final CustomCreativeTab tabStairChiselBlocks = new CustomCreativeTab("tabStairChiselBlocks", true); // this serves mostly just to load the static initializers public static void preInit() { @@ -94,6 +95,10 @@ public class ChiselTabs { tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0])); else tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.lit_pumpkin)); + if (Features.ICE_STAIRS.enabled()) + tabStairChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.iceStairs[0])); + else + tabStairChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.nether_brick_stairs)); if (atLeastOneModIsLoaded) { if (Features.ARCANE.enabled()) { diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 96185575..f7300f95 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1655,6 +1655,7 @@ itemGroup.tabStoneChiselBlocks=Stone Chisel Blocks itemGroup.tabWoodChiselBlocks=Wood Chisel Blocks itemGroup.tabMetalChiselBlocks=Metal Chisel Blocks itemGroup.tabModdedChiselBlocks=Modded Chisel Blocks +itemGroup.tabStairChiselBlocks=Chisel Stairs itemGroup.tabChisel=Chisel Items #Container diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png index 5192e16c..0430113d 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png index 03b77ded..257e5c10 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/uberWavy.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/uberWavy.png new file mode 100644 index 00000000..14982a6b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/uberWavy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/uberWavy.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/uberWavy.png.mcmeta new file mode 100644 index 00000000..f0139e77 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/uberWavy.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-side.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-side.png deleted file mode 100644 index 5e731219..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-side.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-side.png.mcmeta deleted file mode 100644 index 9f04d7ff..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-side.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 0 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-tip.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-tip.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-tip.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-tip.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-tip.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot-tip.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/bot.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/crosssection.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/crosssection.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/crosssection.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/crosssection.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/crosssection.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/crosssection.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-left.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-left.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-left.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-left.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-left.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-left.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-right.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-right.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-right.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-right.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-right.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face-right.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/face.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-down.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-down.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-down.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-down.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-down.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-down.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-tip.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-tip.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-tip.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-tip.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-tip.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-tip.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-up.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-up.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-up.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-up.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-up.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/left-up.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-down.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-down.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-down.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-down.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-down.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-down.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-tip.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-tip.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-tip.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-tip.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-tip.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-tip.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-up.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-up.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-up.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-up.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-up.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/right-up.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/side.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/side.png deleted file mode 100644 index 5e731219..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/side.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/side.png.mcmeta deleted file mode 100644 index 9f04d7ff..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/side.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 0 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-side.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-side.png deleted file mode 100644 index 5e731219..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-side.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-side.png.mcmeta deleted file mode 100644 index 9f04d7ff..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-side.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 0 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-tip.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-tip.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-tip.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-tip.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-tip.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top-tip.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top.png deleted file mode 100644 index e0cbcd9a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top.png.mcmeta deleted file mode 100644 index 3a077b37..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerHack/top.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -}