diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index c3faf549..167b5c74 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -816,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.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/controllerPurple", new SubmapManagerFakeController(4)); + futura.carverHelper.addVariation("tile.futura.5.desc", 5, "futura/WIP/uberWavy", new SubmapManagerFakeController(5)); 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/client/render/SubmapManagerFakeController.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java index b3f86484..3d0dd540 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; @@ -31,9 +32,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 +50,21 @@ 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); - } + + switch(meta) + { + default: + Chisel.logger.info("SubmapManagerFakeController was called on block" + block.getUnlocalizedName() + + " but an entry was not provided in this class!"); + case 2: + map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); + break; + case 4: + map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controllerPurple"), 2, 2); + break; + case 5: + map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/uberWavy"), 2, 2); + break; + } } } 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 c552e11e..f57359be 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/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 - ] - } -}