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 00000000..d64e1e23 --- /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 d47c8373..00000000 --- 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 4d3e85f2..00000000 --- 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 763b5198..d53d6e9f 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 d47c8373..00000000 --- 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 d47c8373..00000000 --- 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 d47c8373..00000000 --- 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 d47c8373..00000000 --- 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 d47c8373..00000000 --- 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 5426f2f9..00000000 --- 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 5a9002e6..c6f572a6 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 d47c8373..00000000 --- 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 4d3e85f2..00000000 --- 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 d9af3920..a1f98c8e 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 d47c8373..00000000 --- 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 d47c8373..00000000 --- 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 00000000..a2870f75 --- /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 00000000..925aa2f6 --- /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 00000000..c57d0185 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/models/block/Wireless.model differ 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 00000000..11bcd6b5 --- /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 00000000..4cc92aa2 --- /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 00000000..b36870d4 --- /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 00000000..5dcd93ae --- /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 651bb98a..00000000 --- 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 07bea7c9..6c150a80 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 00000000..c9b12d08 --- /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 00000000..c2c0f035 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/models/block/tnt.model differ diff --git a/src/main/resources/assets/appliedenergistics2/models/test_file b/src/main/resources/assets/appliedenergistics2/models/test_file new file mode 100644 index 00000000..e20b8735 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/test_file @@ -0,0 +1 @@ +tile.BlockCharger \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/test_file_2 b/src/main/resources/assets/appliedenergistics2/models/test_file_2 new file mode 100644 index 00000000..faff0629 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/test_file_2 @@ -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 } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png new file mode 100644 index 00000000..d09b2aec Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWireless.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png new file mode 100644 index 00000000..65a39ecd Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessInside.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png new file mode 100644 index 00000000..716188fe Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockWirelessOn.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt.model b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt.model new file mode 100644 index 00000000..0e8a0ede Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt.model differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_bottom.png new file mode 100644 index 00000000..cc2e5867 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_bottom.png differ 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 00000000..21109fbe Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_side.png differ 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 00000000..ceb44b6d Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/tnt_top.png differ