tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

New Models 

- Wireless Point
- Tiny TNT
This commit is contained in:
dpeter99 2016-07-11 21:38:40 +02:00
parent 524dc52dd6
commit 4eccb1e770
36 changed files with 282 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/assets/appliedenergistics2/blockstates/BlockTinyTNT.json Normal file
View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "appliedenergistics2:BlockTinyTNT" }
}
}

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCellWorkBench.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

1
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.ignore.json
View File

@ -1 +0,0 @@
up

5
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json
View File

@ -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}
}
}

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCondenser.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCreativeEnergyCell.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockDenseEnergyCell.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyAcceptor.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockEnergyCell.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.ignore.json
View File

@ -1,2 +0,0 @@
forward
up

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockGrinder.json
View File

@ -1,5 +1,5 @@
{
"variants": {
"normal": { "model": "appliedenergistics2:tile.BlockGrinder"}
"normal": { "model": "appliedenergistics2:tile.BlockGrinder" }
}
}

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockIOPort.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

1
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.ignore.json
View File

@ -1 +0,0 @@
up

5
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json
View File

@ -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 }
}
}

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSecurity.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

2
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockSpatialIOPort.ignore.json
View File

@ -1,2 +0,0 @@
up
forward

5
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockWireless.json Normal file
View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "appliedenergistics2:tile.BlockWireless", "y": 180 }
}
}

23
src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json Normal file
View File

@ -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 ] }
}
}
]
}

BIN
src/main/resources/assets/appliedenergistics2/models/block/Wireless.model Normal file
View File

Binary file not shown.

12
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE _all.json Normal file
View File

@ -0,0 +1,12 @@
{
"parent": "appliedenergistics2:block/cube_AE",
"textures": {
"particle": "#all",
"down": "#all",
"up": "#all",
"north": "#all",
"east": "#all",
"south": "#all",
"west": "#all"
}
}

25
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE.json Normal file
View File

@ -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"}
}
}
]
}

12
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json Normal file
View File

@ -0,0 +1,12 @@
{
"parent": "appliedenergistics2:block/cube_AE",
"textures": {
"particle": "#side",
"down": "#bottom",
"up": "#top",
"north": "#side",
"east": "#side",
"south": "#side",
"west": "#side"
}
}

12
src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_machine.json Normal file
View File

@ -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"
}
}

19
src/main/resources/assets/appliedenergistics2/models/block/cube_machine.json
View File

@ -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"
}
}

4
src/main/resources/assets/appliedenergistics2/models/block/tile.BlockGrinder.json
View File

@ -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"
}
}

152
src/main/resources/assets/appliedenergistics2/models/block/tile.BlockWireless.json Normal file
View File

@ -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 ] }
}
}
]
}

BIN
src/main/resources/assets/appliedenergistics2/models/block/tnt.model Normal file
View File

Binary file not shown.

1
src/main/resources/assets/appliedenergistics2/models/test_file Normal file
View File

@ -0,0 +1 @@
tile.BlockCharger

30
src/main/resources/assets/appliedenergistics2/models/test_file_2 Normal file
View File

@ -0,0 +1,30 @@
{
"variants": {
"forward=north,up=up": { "model": "appliedenergistics2:test", "y": 180 },
"forward=north,up=down": { "model": "appliedenergistics2:test", "y": 180, "x": 180 },
"forward=north,up=east": { "model": "appliedenergistics2:test", "y": 90, "x": 0},
"forward=north,up=west": { "model": "appliedenergistics2:test", "y": 180 },
"forward=south,up=up": { "model": "appliedenergistics2:test", "y": 0 },
"forward=south,up=down": { "model": "appliedenergistics2:test", "y": 0 },
"forward=south,up=north": { "model": "appliedenergistics2:test", "y": 0 },
"forward=south,up=south": { "model": "appliedenergistics2:test", "y": 0 },
"forward=south,up=east": { "model": "appliedenergistics2:test", "y": 0 },
"forward=south,up=west": { "model": "appliedenergistics2:test", "y": 0 },
"forward=east,up=up": { "model": "appliedenergistics2:test", "y": 90 },
"forward=east,up=down": { "model": "appliedenergistics2:test", "y": 90 },
"forward=east,up=north": { "model": "appliedenergistics2:test", "y": 90 },
"forward=east,up=south": { "model": "appliedenergistics2:test", "y": 90 },
"forward=east,up=east": { "model": "appliedenergistics2:test", "y": 90 },
"forward=east,up=west": { "model": "appliedenergistics2:test", "y": 90 },
"forward=west,up=up": { "model": "appliedenergistics2:test", "y": 270 },
"forward=west,up=down": { "model": "appliedenergistics2:test", "y": 270 },
"forward=west,up=north": { "model": "appliedenergistics2:test", "y": 270 },
"forward=west,up=south": { "model": "appliedenergistics2:test", "y": 270 },
"forward=west,up=east": { "model": "appliedenergistics2:test", "y": 270 },
"forward=west,up=west": { "model": "appliedenergistics2:test", "y": 270 }
}
}

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 490 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 267 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/tnt.model Normal file
View File

Binary file not shown.

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B