From 9ea8a3bf1f67aab1b32b7835356cdcab468a9c6d Mon Sep 17 00:00:00 2001 From: Cricket Date: Mon, 5 Jan 2015 20:57:32 -0500 Subject: [PATCH] Fixed it and my horrible derp :dancers: --- .../cricketcraft/chisel/init/ModBlocks.java | 3 ++- .../blocks/futura/cricketTest-ctm.png | Bin 0 -> 3897 bytes .../textures/blocks/futura/cricketTest.png | Bin 0 -> 1005 bytes .../blocks/futura/cricketTest.png.mcmeta | 18 ++++++++++++++++++ .../blocks/hexPlating/hexBlue.png.mcmeta | 18 ++++++++++++++++++ .../blocks/hexPlating/hexGray.png.mcmeta | 18 ++++++++++++++++++ .../blocks/hexPlating/hexGreen.png.mcmeta | 18 ++++++++++++++++++ .../blocks/hexPlating/hexPink.png.mcmeta | 18 ++++++++++++++++++ 8 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 21484d19..b51f6d99 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -103,7 +103,7 @@ public class ModBlocks { public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; - //1.8 or at least so you thing :P + //1.8 or at least so you think :P public static BlockCarvable granite, polishedGranite; public static BlockCarvable diorite, polishedDiorite; public static BlockCarvable andesite, polishedAndesite; @@ -1609,6 +1609,7 @@ public class ModBlocks { 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.2.desc"), 3, "futura/cricketTest"); futura.carverHelper.register(futura, "futura"); Carving.chisel.registerOre("futura", "futura"); } diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff6336d8e467fa2e76cb15db3b94e30f13eb34b GIT binary patch literal 3897 zcmeAS@N?(olHy`uVBq!ia0vp^3JeU48#tJOtp8i58v-fD;vjb?hIQv;UIIBR>5jgR z3=A9lx&I`xGB7YR1o(uw0>#bD%+l+PeSCb3eK*zHZ}P35S${@yrm^vjdgD#LH=e#X zo;-OnP}wLL4T0eo0)dxa-UQ|ohLRw^;Qu2VFa&>RR|Uo}XMsm#F#`kNVGw3Kp1&dm zC@4|l8c`CQpH@rz%|L!#W5tqxp!*!w8gvl zTn-z&Kl%UvyPaECr#y_w2@B6?da`zsLg(*Nul?umPrA3{@&7NcratQX{`+rq{nxS+ z2Y-IExOb}Ohe^QEodyL*nG`txPU<^v!6*76M%U`t!9RNXD$&W+LMFFxW@5z-uow&K1e>G3{YX6;ISA7q= zbMJVC-1;4{Ugga5mb^<6d&^K$$`p{4db9PF>!a^0cPr#ddP%TeHA1f7`R3D5zF={9rR%(EICb5`5JQY_}cwaKn1a z@n&b6Zw{3mw#S(p+`Ob->}a?k z$Z*Qiq2l_SEi;lB#n*1`sFaFt&Y14Y!_VNgMrU`xUXMSPrQ%C;ojD&f{G0Xa@qtjrm^fnw zje~Q32~X%QGgz?r-8NI1ApLcp))pGG7H3PuL+Ra%atw z)vOKAeoRng*3thL|KLu;x;>3orp(*-tv9TJXFIzQpIx@X*Sg$>ha1>$C3Exi?{%)U zu{e^}$c?(l$(OW(=PzkMSPhieg^#$NIl#)#O*zm#e;d75HRv-Z#PeqU7cFHdT$zI%ti(er~OMF8}~W0T7`G_6&6TLw7XYq!;rCLNn;;3hb-fQ zIm|8PXFa<$#R@K3y*@EP`52?-f~G|;%`EqQSRfPPzG=IAY~_HgqLPOKm9*Z*fe^Y6CIsxNBWK^+%QS3j3^P60g9%9XDb~CLQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13lB!R-;q~2Ie?V7srqY_qo#!=E^$qIA3;qW$++ds^hhXq+XJL-r>?E4JH$cqdGSE zKMascY>aJ^2$-^BrtRPVPrs`DW9|F@qoUF?wV;@F-~0}_5?@IPCI?2ZMAj`Q-EVXL z=6yV2&L@@pH#@i-t{1g6B$rn?%yyI2X)HdvA=Hm^14EX_^6on33oJ_w>^XNW7Il01{fmlOf2?`oczsHvB7?{RkuZnZHCyIxxNpFBQq%v_vA)#| zCA#Sx7G=xXw`5*9C}a`N6a91w1NVZql3g#%8GHk{K2KhdeaeBe;l)y;9WxuFD@0EG z?tA=w{zK2abqw=GZC}hXGGJ+7nsSIMV{-pC;cwE%6fK{6-n&sK+OX~^599H7UmDDM ztsX5co-KjEZx9#>&fD`Eq~hzJ^U&s znU}?|F37fYKCsc+c7g9=zG(+`Cf(3l&Jw|3y5zF!e#VTZpc(U7fWhd+;G#eE;8~tK rhZZ~BE0>v{zdwk|E@q31|Ic(O!lbP0l+XkKSoxdn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta new file mode 100644 index 00000000..a1eb85fb --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "width": 16, + "height": 16, + "frametime": 1, + "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/hexBlue.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png.mcmeta new file mode 100644 index 00000000..71538873 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 4, + 3, + 2, + 1, + 0, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta new file mode 100644 index 00000000..71538873 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 4, + 3, + 2, + 1, + 0, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta new file mode 100644 index 00000000..71538873 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 4, + 3, + 2, + 1, + 0, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta new file mode 100644 index 00000000..71538873 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 4, + 3, + 2, + 1, + 0, + ] + } +} \ No newline at end of file