diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index d52f7e8e..591ff3da 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -668,9 +668,10 @@ public enum Features { void addBlocks() { BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock/* , "futura/screenOverlay-ctm" */).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F) .setResistance(10F); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/screenMetallicWIP"); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/screenCyanWIP"); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/controllerWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/WIP/screenMetallicWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/WIP/screenCyanWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/WIP/controllerWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.3.desc"), 3, "futura/WIP/wavyWIP"); futura.carverHelper.register(futura, "futura"); Carving.chisel.registerOre("futura", "futura"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index d02e9cb9..9d534ffc 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -105,6 +105,7 @@ tile.futura.name=Futura Block 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 +tile.futura.3.desc=Poptart Rainbow #Waterstone tile.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Base/controller.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/controller.png new file mode 100644 index 00000000..53703690 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Base/controller.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyan-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/screenCyan-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyan-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/futura/Base/screenCyan-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyan-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Base/screenCyan-ctm.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyan-ctm.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/futura/Base/screenCyan-ctm.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyan.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/screenCyan.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyan.png rename to src/main/resources/assets/chisel/textures/blocks/futura/Base/screenCyan.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenMetallic-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/screenMetallic-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenMetallic-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/futura/Base/screenMetallic-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenMetallic-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Base/screenMetallic-ctm.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenMetallic-ctm.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/futura/Base/screenMetallic-ctm.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenMetallic.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/screenMetallic.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenMetallic.png rename to src/main/resources/assets/chisel/textures/blocks/futura/Base/screenMetallic.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png b/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png new file mode 100644 index 00000000..221ab635 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta new file mode 100644 index 00000000..f0139e77 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/Base/wavy.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller-ctm3.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller-ctm3.png new file mode 100644 index 00000000..3e6c531c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller-ctm3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller.png new file mode 100644 index 00000000..53703690 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controller.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm1.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm1.png new file mode 100644 index 00000000..efc61d9e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm2.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm2.png new file mode 100644 index 00000000..eea7db63 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/controllerGlow-ctm2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenOverlay-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP-ctm.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan-ctm.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan.png new file mode 100644 index 00000000..86e8064b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenCyan.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png new file mode 100644 index 00000000..335776ed Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenMetallicWIP-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenMetallicWIP-ctm.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic-ctm.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic.png new file mode 100644 index 00000000..86e8064b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/screenMetallic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png new file mode 100644 index 00000000..ae33f0f5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta new file mode 100644 index 00000000..f0139e77 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/Overlay/wavy.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png new file mode 100644 index 00000000..c7625808 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta new file mode 100644 index 00000000..68df5399 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm1.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png new file mode 100644 index 00000000..5128d610 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta new file mode 100644 index 00000000..68df5399 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png new file mode 100644 index 00000000..b9c0954d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png.mcmeta new file mode 100644 index 00000000..68df5399 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm3.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png rename to src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP-ctm.png.mcmeta new file mode 100644 index 00000000..c82b1666 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP-ctm.png.mcmeta @@ -0,0 +1,23 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenCyanWIP.png rename to src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenCyanWIP.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenMetallicWIP-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenMetallicWIP-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP-ctm.png.mcmeta new file mode 100644 index 00000000..c82b1666 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP-ctm.png.mcmeta @@ -0,0 +1,23 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/screenMetallicWIP.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/futura/screenMetallicWIP.png rename to src/main/resources/assets/chisel/textures/blocks/futura/WIP/screenMetallicWIP.png diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png new file mode 100644 index 00000000..15397ef0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png.mcmeta new file mode 100644 index 00000000..f0139e77 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/wavyWIP.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png deleted file mode 100644 index b86b90b2..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png.mcmeta deleted file mode 100644 index 0805fb46..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm1.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 5, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png deleted file mode 100644 index 937abb3e..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta deleted file mode 100644 index 0805fb46..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm2.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 5, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png deleted file mode 100644 index 00c3171b..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png.mcmeta deleted file mode 100644 index 0805fb46..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP-ctm3.png.mcmeta +++ /dev/null @@ -1,16 +0,0 @@ -{ - "animation": { - "frametime": 5, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta index 3a21c060..6637c41e 100644 --- a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta +++ b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexAnim.png.mcmeta @@ -1,16 +1,5 @@ { "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ] + "frametime": 2 } } diff --git a/src/main/resources/assets/chisel/textures/chisel2Gui.png b/src/main/resources/assets/chisel/textures/chisel2Gui.png new file mode 100644 index 00000000..0d86d5a6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/chisel2Gui.png differ diff --git a/src/main/resources/assets/chisel/textures/chiselGUIRevamp.png b/src/main/resources/assets/chisel/textures/chisel2GuiScroll.png similarity index 100% rename from src/main/resources/assets/chisel/textures/chiselGUIRevamp.png rename to src/main/resources/assets/chisel/textures/chisel2GuiScroll.png