From 4eccb1e770975bc43e2ce59cc86a3c13fadf3878 Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Mon, 11 Jul 2016 21:38:40 +0200 Subject: [PATCH] New Models - Wireless Point - Tiny TNT --- .../blockstates/BlockTinyTNT.json | 5 + .../tile.BlockCellWorkBench.ignore.json | 2 - .../blockstates/tile.BlockCharger.ignore.json | 1 - .../blockstates/tile.BlockCharger.json | 5 +- .../tile.BlockCondenser.ignore.json | 2 - .../tile.BlockCreativeEnergyCell.ignore.json | 2 - .../tile.BlockDenseEnergyCell.ignore.json | 2 - .../tile.BlockEnergyAcceptor.ignore.json | 2 - .../tile.BlockEnergyCell.ignore.json | 2 - .../blockstates/tile.BlockGrinder.ignore.json | 2 - .../blockstates/tile.BlockGrinder.json | 2 +- .../blockstates/tile.BlockIOPort.ignore.json | 2 - .../tile.BlockInscriber.ignore.json | 1 - .../blockstates/tile.BlockInscriber.json | 5 +- .../tile.BlockSecurity.ignore.json | 2 - .../tile.BlockSpatialIOPort.ignore.json | 2 - .../blockstates/tile.BlockWireless.json | 5 + .../models/block/BlockTinyTNT.json | 23 +++ .../models/block/Wireless.model | Bin 0 -> 2007 bytes .../models/block/cube/cube_AE _all.json | 12 ++ .../models/block/cube/cube_AE.json | 25 +++ .../models/block/cube/cube_AE_bottom_top.json | 12 ++ .../models/block/cube/cube_AE_machine.json | 12 ++ .../models/block/cube_machine.json | 19 --- .../models/block/tile.BlockGrinder.json | 4 +- .../models/block/tile.BlockWireless.json | 152 ++++++++++++++++++ .../models/block/tnt.model | Bin 0 -> 1385 bytes .../appliedenergistics2/models/test_file | 1 + .../appliedenergistics2/models/test_file_2 | 30 ++++ .../textures/blocks/BlockWireless.png | Bin 0 -> 252 bytes .../textures/blocks/BlockWirelessInside.png | Bin 0 -> 490 bytes .../textures/blocks/BlockWirelessOn.png | Bin 0 -> 267 bytes .../textures/blocks/tnt.model | Bin 0 -> 1385 bytes .../textures/blocks/tnt_bottom.png | Bin 0 -> 112 bytes .../textures/blocks/tnt_side.png | Bin 0 -> 212 bytes .../textures/blocks/tnt_top.png | Bin 0 -> 237 bytes 36 files changed, 282 insertions(+), 52 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.ignore.json delete mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.ignore.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/Wireless.model create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cube_machine.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tnt.model create mode 100644 src/main/resources/assets/appliedenergistics2/models/test_file create mode 100644 src/main/resources/assets/appliedenergistics2/models/test_file_2 create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/tnt.model create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_bottom.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_side.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_top.png diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json new file mode 100644 index 000000000..d64e1e233 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "appliedenergistics2:BlockTinyTNT" } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.ignore.json deleted file mode 100644 index 4d3e85f27..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.ignore.json +++ /dev/null @@ -1 +0,0 @@ -up \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json index 763b5198c..d53d6e9f2 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json @@ -1,8 +1,5 @@ { "variants": { - "forward=north": { "model": "appliedenergistics2:tile.BlockCharger", "y": 180 }, - "forward=south": { "model": "appliedenergistics2:tile.BlockCharger", "y": 0 }, - "forward=east": { "model": "appliedenergistics2:tile.BlockCharger", "y": 90 }, - "forward=west": { "model": "appliedenergistics2:tile.BlockCharger", "y": 270 } + "normal": { "model": "appliedenergistics2:tile.BlockCharger", "y":180} } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.ignore.json deleted file mode 100644 index 5426f2f97..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -forward -up \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json index 5a9002e68..c6f572a64 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockGrinder"} + "normal": { "model": "appliedenergistics2:tile.BlockGrinder" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.ignore.json deleted file mode 100644 index 4d3e85f27..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.ignore.json +++ /dev/null @@ -1 +0,0 @@ -up \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json index d9af39204..a1f98c8ef 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json @@ -1,8 +1,5 @@ { "variants": { - "forward=north": { "model": "appliedenergistics2:tile.BlockInscriber", "y": 180 }, - "forward=south": { "model": "appliedenergistics2:tile.BlockInscriber", "y": 0 }, - "forward=east": { "model": "appliedenergistics2:tile.BlockInscriber", "y": 90 }, - "forward=west": { "model": "appliedenergistics2:tile.BlockInscriber", "y": 270 } + "normal": { "model": "appliedenergistics2:tile.BlockInscriber", "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.ignore.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.ignore.json deleted file mode 100644 index d47c83737..000000000 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.ignore.json +++ /dev/null @@ -1,2 +0,0 @@ -up -forward \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json new file mode 100644 index 000000000..a2870f75a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "appliedenergistics2:tile.BlockWireless", "y": 180 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json new file mode 100644 index 000000000..925aa2f6a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json @@ -0,0 +1,23 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "blocks/tnt_side", + "1": "blocks/tnt_top", + "2": "blocks/tnt_bottom" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4.0, 0.0, 4.0 ], + "to": [ 12.0, 8.0, 12.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model b/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model new file mode 100644 index 0000000000000000000000000000000000000000..c57d0185032a43bb57782a5b9f3ac3a3cb060756 GIT binary patch literal 2007 zcmWIWW@Zs#;Nak3NL}{Yg8>O}F)%RX=BK3Q=w%h>=bfDqm_OS<;P`#*uhtQ75@(B; zN;qBmVmMXJH_9|~_LlaQT@r@AR~V)$zFxNKeyt(fZO;Sy5-v<*Z=dkE{`uqf_h(K& zWxZ8D=c&=DNi9oSi<{@{&T-xLqH#$}8*Ajk*nOVz7i9M?eK@~j^7{MFI%eMq5)zYi zeSgjMV~Mexy2&b^b>E5}w@A9)N&9n8GISr;r`G_t~w-(O$6#Vt_v3u;ZmL4s-*cY#`;nUV1iGr~PEVZAO`S6+_?UB=aZlYcMqPxR- z^YP_z+?iL;eE8UKigET8pC7D6Z8mOe1dTr*f4XGWedfAugQ}K`$7`BC96mcI>QlRF z!wz<)TFJZs$6Q|pdFGkT=Xkmv)HvrDF!@i|_;5XAx;B&j#E9Mh3d7@m9|{v*apzK6 zNG_*Mv!roj<0Q8nC$^>q5wrfTDk^)fKfzl;tnxkEf*O^Y%Jf}KH#IH%T&lnQy-teB*71Q4`vQH2 zIsAv_mw!;mI4#{^&lApkJ#J}C)YW^%O~#+f=a{WNyIyMM@)ch%{K;ep*|b`9g1ziv z#T7Yqyfay@#YK9)xwrQKv-R`6^EC}B9EUOul!{~@T(>yNxLo$=tOJ)l=f)N>CfP3dZrR8CA@=Zt$N5j&7Qa_u zo%W$|%YrwJM;cxEWo$NAsu>&N|P3h-v<$YXHZ?##@<5Fx|BfII6c zFfcHbq*j!a7Nr*JJLTjjXNPANrRJm-7klOvXQrg;738HezG4*p*BRjF&dVhQ%BsAc z9xg!)3=9Gw%)!RMz##wmeAR^~G>Fi4fSMwA5Sru zXJBBA^mK6yvG7m5WS++y$m4o3vNu}1iP5x4>gk-Ne=7vz-fidaRqub$q+owIb;irG z-Lckk{clUGw*IZVzvuk(&zI|Lo>eCiSnF&dTD~me$E%a|Hf^bk;y0` zp0G8_lxad{&-p%vj6-Y_q$|v4pI!Ah!9b&zE8)J6(=P^Liv?+O8;)2o|EQ?1p14Ng z8^6MdlZ*^2UaZc3``P`*pV|XS8&_PlQjSz+SbVulg#CeEX2RW{HUHQRTF*~uVfZyE zw78(spCMiCL>}L=hPBckx2;Q?d~!*WK0{QH!lbueH)cAl>-70(qqIsd=V;wShegb6 z1>2b2Zh!s%)y`1Hj(1im=S$4&=J(A!6x|c6Ex>T)-?>SjmS5u9bnJcg z&3%mbF5jB{G<52DP+{!p>gTe~DWM6Jcsg_*?SIe6!0?I@U*eHsz?FDF$>ufBhvMf? zCp}6^NOh}~v%kTKS6@QHi&sJ-PSwC5;%q{Kfc}il+85X~4n{r@j68GTz;>P%$=mPOoMGqk zn!3Yn3d{55Q>UnlEj40MNqaW+#m}8>8dD@+&wM2*wX43&h<(+kk0pgX8$b9@OR&`u zPrUQ#y3NzW{Qs6u{vngL)N95Z6Mu_as=wl+yk50b9(tdjKi{MN$N&9x?Ax8ssj%^< z^&K|kyDbr1X1pP@z|cM^AuX+7?Y7?=OJ3~`TdqsF@S<@wcn;qpBWe! z{xE=oj*&@(0a588=Sfgb0tGt)BdWjvZ&ZEA(E-Y_2tC!zxS{}&f6+}tb|EMV5vJ{6 b#bp{OLIb>6L7AO_nSq(%90LQxXD|-{y}M8W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json new file mode 100644 index 000000000..11bcd6b55 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json @@ -0,0 +1,12 @@ +{ + "parent": "appliedenergistics2:block/cube_AE", + "textures": { + "particle": "#all", + "down": "#all", + "up": "#all", + "north": "#all", + "east": "#all", + "south": "#all", + "west": "#all" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json new file mode 100644 index 000000000..4cc92aa27 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json @@ -0,0 +1,25 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "display": { + "firstperson_righthand": { + "rotation": [ 0, 135, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "shade": false, + "faces": { + "down": { "texture": "#down"}, + "up": { "texture": "#up"}, + "north": { "texture": "#north"}, + "south": { "texture": "#south"}, + "west": { "texture": "#west"}, + "east": { "texture": "#east"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json new file mode 100644 index 000000000..b36870d4d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json @@ -0,0 +1,12 @@ +{ + "parent": "appliedenergistics2:block/cube_AE", + "textures": { + "particle": "#side", + "down": "#bottom", + "up": "#top", + "north": "#side", + "east": "#side", + "south": "#side", + "west": "#side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json new file mode 100644 index 000000000..5dcd93ae8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json @@ -0,0 +1,12 @@ +{ + "parent": "appliedenergistics2:block/cube/cube_AE", + "textures": { + "particle": "#front", + "down": "#bottom", + "up": "#top", + "north": "#front", + "east": "#side", + "south": "#side", + "west": "#side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube_machine.json b/src/main/resources/assets/appliedenergistics2/models/block/cube_machine.json deleted file mode 100644 index 651bb98aa..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube_machine.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "block/cube", - "display": { - "firstperson_righthand": { - "rotation": [ 0, 135, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - }, - "textures": { - "particle": "#front", - "down": "#bottom", - "up": "#top", - "north": "#front", - "east": "#side", - "south": "#side", - "west": "#side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json index 07bea7c9c..6c150a80e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json @@ -1,10 +1,10 @@ { - "parent": "appliedenergistics2:block/cube_machine", + "parent": "appliedenergistics2:block/cube/cube_AE_machine", + "ambientocclusion": false, "textures": { "top": "appliedenergistics2:blocks/BlockGrinder", "bottom": "appliedenergistics2:blocks/BlockGrinderBottom", "front": "appliedenergistics2:blocks/BlockGrinderFront", "side": "appliedenergistics2:blocks/BlockGrinderSide" - } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json new file mode 100644 index 000000000..c9b12d081 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json @@ -0,0 +1,152 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "appliedenergistics2:blocks/BlockWirelessInside", + "1": "appliedenergistics2:blocks/BlockWireless" + }, + "elements": [ + { + "name": "Base", + "from": [ 4.0, 0.0, 4.0 ], + "to": [ 12.0, 2.0, 12.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 4.0, 14.0, 12.0, 16.0 ] }, + "east": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 2.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 8.0, 2.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 8.0, 2.0 ] }, + "up": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, + "down": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 12.0 ] } + } + }, + { + "name": "Front_B", + "from": [ 5.0, 2.0, 3.0 ], + "to": [ 11.0, 4.0, 5.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 6.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 15.0, 7.0, 13.0, 5.0 ] }, + "south": { "texture": "#0", "uv": [ 11.0, 3.0, 5.0, 5.0 ] }, + "west": { "texture": "#0", "uv": [ 13.0, 3.0, 15.0, 5.0 ] }, + "up": { "texture": "#0", "uv": [ 5.0, 13.0, 11.0, 15.0 ] }, + "down": { "texture": "#0", "uv": [ 5.0, 1.0, 11.0, 3.0 ] } + } + }, + { + "name": "Back_B", + "from": [ 5.0, 2.0, 11.0 ], + "to": [ 11.0, 4.0, 13.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 10.0, 0.0, 16.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 13.0, 4.0, 15.0, 6.0 ] }, + "south": { "texture": "#0", "uv": [ 11.0, 11.0, 5.0, 13.0 ] }, + "west": { "texture": "#0", "uv": [ 1.0, 4.0, 3.0, 6.0 ] }, + "up": { "texture": "#0", "uv": [ 5.0, 1.0, 11.0, 3.0 ] }, + "down": { "texture": "#0", "uv": [ 5.0, 13.0, 11.0, 15.0 ] } + } + }, + { + "name": "Left_B", + "from": [ 11.0, 2.0, 5.0 ], + "to": [ 13.0, 4.0, 11.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 13.0, 4.0, 15.0, 6.0 ] }, + "east": { "texture": "#0", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, + "south": { "texture": "#0", "uv": [ 1.0, 6.0, 3.0, 8.0 ] }, + "west": { "texture": "#0", "uv": [ 5.0, 3.0, 11.0, 5.0 ] }, + "up": { "texture": "#0", "uv": [ 1.0, 5.0, 3.0, 11.0 ] }, + "down": { "texture": "#0", "uv": [ 1.0, 5.0, 3.0, 11.0 ] } + } + }, + { + "name": "Right_B", + "from": [ 3.0, 2.0, 5.0 ], + "to": [ 5.0, 4.0, 11.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 1.0, 4.0, 3.0, 6.0 ] }, + "east": { "texture": "#0", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, + "south": { "texture": "#0", "uv": [ 13.0, 6.0, 15.0, 8.0 ] }, + "west": { "texture": "#0", "uv": [ 5.0, 3.0, 11.0, 5.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 5.0, 15.0, 11.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 5.0, 15.0, 11.0 ] } + } + }, + { + "name": "Front_S", + "from": [ 7.0, 3.0, 2.0 ], + "to": [ 9.0, 8.0, 3.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 5.0, 2.0, 10.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 5.0, 1.0, 10.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 5.0, 2.0, 10.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 5.0, 1.0, 10.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } + } + }, + { + "name": "Back_S", + "from": [ 7.0, 3.0, 13.0 ], + "to": [ 9.0, 8.0, 14.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 14.0, 2.0, 16.0, 7.0 ] }, + "east": { "texture": "#0", "uv": [ 14.0, 2.0, 15.0, 7.0 ] }, + "south": { "texture": "#0", "uv": [ 14.0, 2.0, 16.0, 7.0 ] }, + "west": { "texture": "#0", "uv": [ 15.0, 2.0, 16.0, 7.0 ] }, + "up": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 14.0, 1.0, 16.0, 2.0 ] } + } + }, + { + "name": "Left_S", + "from": [ 2.0, 3.0, 7.0 ], + "to": [ 3.0, 8.0, 9.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 8.0 ] }, + "east": { "texture": "#0", "uv": [ 11.0, 3.0, 13.0, 8.0 ] }, + "south": { "texture": "#0", "uv": [ 13.0, 3.0, 11.0, 8.0 ] }, + "west": { "texture": "#0", "uv": [ 11.0, 3.0, 13.0, 8.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 5.0 ] }, + "down": { "texture": "#0", "uv": [ 11.0, 3.0, 12.0, 5.0 ] } + } + }, + { + "name": "Right_S", + "from": [ 13.0, 3.0, 7.0 ], + "to": [ 14.0, 8.0, 9.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } + } + }, + { + "name": "Torch_B", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 8.0, 9.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, + "east": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, + "south": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, + "west": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 15.0 ] }, + "up": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 11.0 ] }, + "down": { "texture": "#1", "uv": [ 7.0, 9.0, 9.0, 11.0 ] } + } + }, + { + "name": "Torch_Off", + "from": [ 7.0, 8.0, 7.0 ], + "to": [ 9.0, 10.0, 9.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, + "east": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, + "south": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, + "west": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, + "up": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, + "down": { "texture": "#1", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tnt.model b/src/main/resources/assets/appliedenergistics2/models/block/tnt.model new file mode 100644 index 0000000000000000000000000000000000000000..c2c0f035611da778a276231be9e9fa5d5d137df6 GIT binary patch literal 1385 zcmWIWW@Zs#;Nak3kXZTJg8>O}F)%RX=BK3Q=w%h>=dGP^I<^+ZL*M%3l)z0&NNd?(gTF3x6NYWvvE zIQ@gtA0^$u(y-_MPRLasvs&r$Yhg^5Mp$aw<383utPYFjo^3vABj~ay&9+eT?nb9# z|HuF8V)t<-t!%rV@x*EF8K)bGde%4dWaG-_G0)SCWuM5*J)!03p92c{%VvBNH+cT? zlkK{|mL-SIESqk8P|oHV!{zzc4$Ln4u|ByqW7lUNzMYG{UYT+syUqIHtcNAl>!1D) z))rp=EKc`F^R1XS&&o3vzkT+JIl!BpqwnUKtI~`N4DHMe47h_-l!1YvB(^5Uo`ql{jZ$9|F4428*@aaX#8KD|JLT?{^Ib<_2-xWxpSuS`~Q#f zb#-~~-v2Xx_vnnY{=X-N2`S0Rn-e~lotUHe`0!=16PG7g9M*jLqF1>wUQWXJPUwuo z+tljz$M`>5B5Y}y)4ty1zm4ML$&W*h6z@K`c}3yF_WzYTd;hzJUv22gpC5Fv=usNi zefPrtHUVq4m5=SRADL+^VVZmL!OK_AH=Wa5$jJZ-mlZ*oaaS1_7_Knj3l|aea4E?z z00j%4Dz4s zCPki>-A$eT?;gxnwqQ=4xTDqDlINL+U6I&N-j53xil5rLcUr|=ectMO=W@l{=R{?1 zKmPSf*+&J9r8O)Z?k?s({T^6^w8_lWJ0Rfn#PG*rruUwVDTQyY{<+eSV0207s*Y(x z?2MeBC6hdv-&;!W{l3X}a>Q9ndpB_*AE_Tt&81bBZfMKkol^&N^sDWd7 zyB=G8E&~HY0ocWiOd<@3A_X~TfZ`D3TLeZFFah4E`jAr&DBmFT1T*5uMd(H#2c!r> xKLZ0pHWQi=&;*BW0k44ofy`glX=O&z`&C3 z=5w%J?Ec)zFcP`m#Xe}dVk#d+?_Go`igho zofiBsZSzW{_g|~-=53D_)v}P`^WU-k4$})08NS;UHhGILuE^Py-@Q>;zu{#`l;`x* zOA}1?bH4cfH*VXEOhys$gsoAgOcOGD&i6579AcXwU12`^?5f8J1{%Fw3HN=RelZAJ zEJ&N%aKwW7M@4=0#5D@v_!Ul^WMo+JVs-Z0&+a$=)E-FMxZ%qk><|1h z6Yl=3`NwY1dVWd^!>>u9#RZlA4C!ho^7xiDtd;(_ZC%>rlS`8H8KQy|CcX8#G1FmP zr_VY;Aaxqxu_}8wsMwZ!tZZy z|4U0roiI;0+9jI6+|a<-=E-CrJ|UOk3~PYi%Z5b;4rOL$Jd8X%3^EdF@2^=N|gzEtGL7#A1r=$FMIxW=@)il$5*b%&gppD zDC^QDDznk?B&YF(RXKeH6Ba(XU%9f&oz+&z>xqhrji}4pd!^Yk`A)2xT%66k)b_ER zary_PKT5iRrD4ziosg?OX0_7g*TR@Ajj+_V$9=4SSREG4J==WLM$lzZnr)%v-HlGg z{*V9F#qQ%wTG@6z9hhD8V|{XK#;(skd^;C?y)xxOcANFXSr1F9*FXIq ztS!9!S)A^V=36muo|R`Te*5ebbAUHHN8imeSEU&l7}}W`7;p!vC<6mSNoqw&X;Esi zeo0MH|6c{4H|B^;(fGeQ|E(4L$bLULu_x~T| z>+15}z5i$Y?$H@({eMpk6H=0sHz#~9J26M`@!`v2CoWI0IIQ{fMXz#WyqtvbozNMF zx2e_bkMV!BMA*_Yr+vN2e;dWglOKm1Dc*f>^NPZU?f)xx_WpMbzuM4~KR@VT(W5l3 z`|gGPZ35P8D<9isKQhx;!Zi2fgO{(KZ#t*BkdpxvE-QjEEw&N zO^Q4%yPG=w-#wVEY{8s7aYw7QCC@VtyCSilydM`X6hF0f@3e}$`n=Wm&gF`?&xy+3 ze*Ei|vX2THOKVs-++ECn`aQ4+X_J|$cR;}DiQ$jMOz%AzQwrZ){d1)u!RV6ERUOlY z*cmxLOD1_Tzqgd$`+bw|XWQaS$qsA&w0A~xvXF zc0IQGTm}Y)06MGA7x0L3B5w+M_VU;?~R^&zJmP`*Lv31-BRi_ncg4oDG% xeg+1HY$h}#pa~A$1Z0na0vut;d}cHg5Wyed%?e7I3@i*R3`~p+41p{lZ2&;68OZ}1?|7^9RlY5J zM#mrZsplDzzI^@K_|YZy;Qu9`G|d^F@CY!sc|JAnX*-x9(bL8#!OWl=tR?TE@^?Q2 P0|SGntDnm{r-UW|UbrPf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_side.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_side.png new file mode 100644 index 0000000000000000000000000000000000000000..21109fbe9ce80fabb537d132eb99d0179f3fe905 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7W_!9ghE&{2-tkuH>;ENl zfBb(dw&?%#*&P4Xr=DjJvdB>WSKr!s;(zC^rvIK#`MH_%?*HRI{QTV9-~DIY#hEu= z{K;d$$i~KI!RGCdIYY*Wr!A1DA#sLN%F!D~0>3;kX1J>`hiy&#ez~5+Nhfl0*bZN5 z{&_+sC&#IX=XQfbP0l+XkKl3rK{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_top.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_top.png new file mode 100644 index 0000000000000000000000000000000000000000..ceb44b6ddd8c3431e8d0e9ac65fe79a862017ab5 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7ws^WYhE&{II{6}RlOj*c z?xs%vcMoPOTQDb2+|g=n$@9#^u1M@B@5hA;#ZPVBJFVibK5zBCbGhQ}bE2}hAOCu# z?4yFl(i#>HcNg=Yeh(}{+GJ+x9T0GOV)$b*(|b?Gl)^Vx|6FNEFuEjkRmZd;c1F(6 zl1ZM-?=7YGe&6IfIpVCPy_>j@kJOK+=F+OmH_COr=+8_PGR$_Uulx1*ugTe~DWM4fHr-