From 92b931434e9339ae6fa601f140dfcb750b0c8eb0 Mon Sep 17 00:00:00 2001 From: shartte Date: Thu, 11 Aug 2016 13:48:36 +0200 Subject: [PATCH] More item models (#30) * Fixed tiny TNT item model. * Flipped the inscriber north/south and implemented item model. * Added several item models. --- .../blockstates/tile.BlockInscriber.json | 2 +- .../models/block/BlockTinyTNT.json | 1 + .../models/block/tile.BlockInscriber.json | 41 ++++++++++--------- .../models/item/BlockTinyTNT.json | 3 ++ .../models/item/QuartzPillarBlock.json | 3 ++ .../models/item/tile.BlockCellWorkbench.json | 3 ++ .../models/item/tile.BlockCondenser.json | 3 ++ .../models/item/tile.BlockDrive.json | 3 ++ .../models/item/tile.BlockEnergyAcceptor.json | 3 ++ .../models/item/tile.BlockGrinder.json | 3 ++ .../models/item/tile.BlockIOPort.json | 3 ++ .../models/item/tile.BlockInscriber.json | 3 ++ .../models/item/tile.BlockSecurity.json | 3 ++ .../models/item/tile.BlockSpatialIOPort.json | 3 ++ .../models/item/tile.BlockWireless.json | 3 ++ 15 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json index a1f98c8e..096dbd8c 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInscriber.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "appliedenergistics2:tile.BlockInscriber", "y": 180 } + "normal": { "model": "appliedenergistics2:tile.BlockInscriber" } } } \ 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 index 925aa2f6..3c3e239e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/BlockTinyTNT.json @@ -1,4 +1,5 @@ { + "parent": "block/block", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "0": "blocks/tnt_side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json index bc1424ff..24bf42ba 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInscriber.json @@ -1,4 +1,5 @@ { + "parent": "block/orientable", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "0": "appliedenergistics2:blocks/BlockInscriber" @@ -6,12 +7,12 @@ "elements": [ { "name": "Left", - "from": [ 0.0, 1.0, 0.0 ], - "to": [ 3.0, 15.0, 16.0 ], + "from": [ 0.0, 1.0, 0.0 ], + "to": [ 3.0, 15.0, 16.0 ], "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, + "south": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } @@ -22,9 +23,9 @@ "from": [ 1.0, 0.0, 1.0 ], "to": [ 15.0, 1.0, 15.0 ], "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, "west": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }, "down": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } @@ -35,9 +36,9 @@ "from": [ 13.0, 1.0, 0.0 ], "to": [ 16.0, 15.0, 16.0 ], "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, + "north": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 14.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 14.0 ] }, "up": { "texture": "#0", "uv": [ 13.0, 0.0, 16.0, 16.0 ] }, "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } @@ -48,9 +49,9 @@ "from": [ 1.0, 15.0, 1.0 ], "to": [ 15.0, 16.0, 15.0 ], "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, + "north": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, "east": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, "west": { "texture": "#0", "uv": [ 1.0, 15.0, 15.0, 16.0 ] }, "up": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, "down": { "texture": "#-1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } @@ -58,12 +59,12 @@ }, { "name": "BottomFill", - "from": [ 3.0, 1.0, 3.0 ], - "to": [ 13.0, 4.0, 15.0 ], + "from": [ 3.0, 1.0, 1.0 ], + "to": [ 13.0, 4.0, 13.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, + "north": { "texture": "#0", "uv": [ 3.0, 12.0, 13.0, 15.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, - "south": { "texture": "#0", "uv": [ 3.0, 12.0, 13.0, 15.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 3.0 ] }, "up": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 13.0 ] }, "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 12.0 ] } @@ -71,8 +72,8 @@ }, { "name": "TopFill", - "from": [ 3.0, 12.0, 5.0 ], - "to": [ 13.0, 15.0, 15.0 ], + "from": [ 3.0, 12.0, 1.0 ], + "to": [ 13.0, 15.0, 11.0 ], "faces": { "north": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 4.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, @@ -84,12 +85,12 @@ }, { "name": "Back", - "from": [ 3.0, 1.0, 0.0 ], - "to": [ 13.0, 15.0, 3.0 ], + "from": [ 3.0, 1.0, 13.0 ], + "to": [ 13.0, 15.0, 16.0 ], "faces": { - "north": { "texture": "#0", "uv": [ 3.0, 0.0, 13.0, 14.0 ] }, + "north": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, - "south": { "texture": "#0", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "south": { "texture": "#0", "uv": [ 3.0, 0.0, 13.0, 14.0 ] }, "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 3.0, 14.0 ] }, "up": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 3.0 ] }, "down": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 3.0 ] } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json b/src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json new file mode 100644 index 00000000..9ced22fe --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/BlockTinyTNT.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:BlockTinyTNT" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json b/src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json new file mode 100644 index 00000000..5f732115 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/QuartzPillarBlock.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/QuartzPillarBlock" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json new file mode 100644 index 00000000..a7a5dd68 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCellWorkbench.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockCellWorkbench" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json new file mode 100644 index 00000000..6938b754 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCondenser.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockCondenser" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json new file mode 100644 index 00000000..f40c9a4b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockDrive.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockDrive" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json new file mode 100644 index 00000000..4f481484 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockEnergyAcceptor.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockEnergyAcceptor" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json new file mode 100644 index 00000000..923b1c9a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockGrinder.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockGrinder" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json new file mode 100644 index 00000000..472c40b5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockIOPort.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockIOPort" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json new file mode 100644 index 00000000..a88f4c16 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInscriber.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockInscriber" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json new file mode 100644 index 00000000..28833942 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSecurity.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockSecurity" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json new file mode 100644 index 00000000..0d6a4b2b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockSpatialIOPort.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockSpatialIOPort" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json new file mode 100644 index 00000000..447ae632 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockWireless.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockWireless" +} \ No newline at end of file