Skip to content

Commit

Permalink
Added better model
Browse files Browse the repository at this point in the history
  • Loading branch information
HenryLoenwind committed Dec 3, 2016
1 parent 1311773 commit 319e455
Show file tree
Hide file tree
Showing 31 changed files with 1,516 additions and 76 deletions.
Binary file added doc/models/blockInventoryChest.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_1_doodad.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_2_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_3_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_4_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_5_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_6_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_7_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_8_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_face.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_full.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_full_base.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_full_doodads.cubik
Binary file not shown.
Binary file added doc/models/blockInventoryChest_wFrame.cubik
Binary file not shown.
Binary file added doc/models/machine_body.cubik
Binary file not shown.
Binary file added doc/textures/invChestConnectors.pspimage
Binary file not shown.
70 changes: 30 additions & 40 deletions resources/assets/enderio/blockstates/blockInventoryChest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,42 @@
"forge_marker": 1,
"defaults": {
"textures": {
"all": "enderio:blocks/machineTemplate",
"particle": "enderio:blocks/machineTemplate",
"texture": "enderio:blocks/blockReinforcedObsidian"
"particle": "enderio:blocks/machineBottom",
"top": "enderio:blocks/machineTop",
"bottom": "enderio:blocks/machineBottom",
"side": "enderio:blocks/machineSide",
"back": "enderio:blocks/machineBack",
"frontframe": "enderio:blocks/machineSide",
"chest": "entity/chest/normal",
"bars": "enderio:blocks/blockReinforcedObsidian",
"color": "enderio:blocks/blockPMonColor",
"con": "enderio:blocks/inventory_chest_connectors",
"canvas": "enderio:blocks/machineBottom"
}
},
"variants": {
"render":{
"defaults":{ "model":"enderio:transform/block" },
"auto":{ "model":"enderio:null" },
"front":{
"submodel":{
"s1":{ "model":"enderio:blockReinforcedObsidianSide", "y":0 },
"s2":{ "model":"enderio:blockReinforcedObsidianSide", "y":90 },
"s3":{ "model":"enderio:blockReinforcedObsidianSide", "y":180 },
"s4":{ "model":"enderio:blockReinforcedObsidianSide", "y":270 },
"s5":{ "model":"enderio:blockReinforcedObsidianTop", "x":90 },
"s6":{ "model":"enderio:blockReinforcedObsidianTop", "x":270 }
}
},
"front_east":{ "submodel":{ "na":{ "model":"minecraft:cube_all" } } },
"front_south":{
"submodel":{
"s1":{ "model":"enderio:blockReinforcedObsidianSide", "y":0 },
"s2":{ "model":"enderio:blockReinforcedObsidianSide", "y":90 },
"s3":{ "model":"enderio:blockReinforcedObsidianSide", "y":180 },
"s4":{ "model":"enderio:blockReinforcedObsidianSide", "y":270 },
"s5":{ "model":"enderio:blockReinforcedObsidianTop", "x":90 },
"s6":{ "model":"enderio:blockReinforcedObsidianTop", "x":270 }
}
},
"front_west":{ "submodel":{ "na":{ "model":"minecraft:cube_all" } } },
"front_on":{ "submodel":{ "na":{ "model":"minecraft:cube_all" } } },
"front_on_east":{ "submodel":{ "na":{ "model":"minecraft:cube_all" } } },
"front_on_south":{ "submodel":{ "na":{ "model":"minecraft:cube_all" } } },
"front_on_west":{ "submodel":{ "na":{ "model":"minecraft:cube_all" } } }
"defaults":{ "model":"enderio:transform/block" },
"auto":{ "model":"enderio:null" },
"front":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":180 },
"front_east":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":270 },
"front_south":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":0 },
"front_west":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":90 },
"front_on":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":180 },
"front_on_east":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":270 },
"front_on_south":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":0 },
"front_on_west":{ "submodel":{ "all":{ "model":"enderio:block_inventory_chest" } }, "y":90 }
},
"size": {
"tiny": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"small": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"medium": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"big": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"large": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"huge": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"enormous": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"warehouse": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } },
"warehouse13": { "submodel":{ "core":{ "model":"enderio:blockInventoryChestCore" } } }
"tiny": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_1" } } },
"small": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_2" } } },
"medium": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_3" } } },
"big": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_4" } } },
"large": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_5" } } },
"huge": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_6" } } },
"enormous": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_7" } } },
"warehouse": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_8" } } },
"warehouse13": { "submodel":{ "thg":{ "model":"enderio:block_inventory_chest_9" } } }
}
}
}
10 changes: 10 additions & 0 deletions resources/assets/enderio/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,16 @@ tile.blockXPVacuum.tooltip.detailed.line1=Pulls nearby XP orbs and pushes
tile.blockXPVacuum.tooltip.detailed.line2=them into adjacent tanks/conduits.
tile.blockXPVacuum.tooltip.detailed.line3=Needs to be activated with liquid XP.

tile.blockInventoryChest_tiny.name=Tiny Inventory System Storage
tile.blockInventoryChest_small.name=Small Inventory System Storage
tile.blockInventoryChest_medium.name=Medium Inventory System Storage
tile.blockInventoryChest_big.name=Big Inventory System Storage
tile.blockInventoryChest_large.name=Large Inventory System Storage
tile.blockInventoryChest_huge.name=Huge Inventory System Storage
tile.blockInventoryChest_enormous.name=Enormous Inventory System Storage
tile.blockInventoryChest_warehouse.name=Inventory System Storage Warehouse
tile.blockInventoryChest_warehouse13.name= Inventory System Storage Extended Warehouse

enderio.gui.permission.denied=Permission denied
enderio.wrench.permission.denied=Permission denied
enderio.soulvial.denied=Permission denied
Expand Down
31 changes: 0 additions & 31 deletions resources/assets/enderio/models/block/blockInventoryChestCore.json

This file was deleted.

251 changes: 251 additions & 0 deletions resources/assets/enderio/models/block/block_inventory_chest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
{
"__comment": "Designed by HenryLoenwind with Cubik Studio - https://cubik.studio",
"parent": "block/block",
"textures": {
"particle": "blocks/machineBottom",
"top": "blocks/machineTop",
"bottom": "blocks/machineBottom",
"side": "blocks/machineSide",
"back": "blocks/machineBack",
"frontframe": "blocks/machineSide",
"chest": "entity/chest/normal",
"bars": "blocks/blockReinforcedObsidian",
"color": "blocks/blockPMonColor",
"con": "blocks/inventory_chest_connectors",
"canvas": "blocks/machineBottom"
},
"elements": [
{
"__comment": "Canvas",
"from": [ 0.25, 0.25, 14 ],
"to": [ 15.75, 15.75, 15 ],
"faces": {
"south": { "uv": [ 0.25, 0.25, 15.75, 15.75 ], "texture": "#canvas" }
}
},
{
"__comment": "___tmp x16",
"from": [ 14, 7, 0.25 ],
"to": [ 15, 9, 1.25 ],
"faces": {
"down": { "uv": [ 1.01, 8.99, 1.99, 8.01 ], "texture": "#bars", "rotation": 180 },
"up": { "uv": [ 1.01, 7.01, 1.99, 7.99 ], "texture": "#bars", "rotation": 180 },
"north": { "uv": [ 1.01, 7.01, 1.99, 8.99 ], "texture": "#bars", "cullface": "south" }
}
},
{
"__comment": "___tmp x16",
"from": [ 12, 1, 0.25 ],
"to": [ 14, 15, 1.25 ],
"faces": {
"north": { "uv": [ 2.01, 1.01, 3.99, 14.99 ], "texture": "#bars", "cullface": "south" },
"west": { "uv": [ 3.99, 1.01, 3.01, 14.99 ], "texture": "#bars" },
"east": { "uv": [ 2.01, 1.01, 2.99, 14.99 ], "texture": "#bars" }
}
},
{
"__comment": "___tmp x16",
"from": [ 9, 12, 0.25 ],
"to": [ 12, 14, 1.25 ],
"faces": {
"down": { "uv": [ 4.01, 3.99, 6.99, 3.01 ], "texture": "#bars", "rotation": 180 },
"up": { "uv": [ 4.01, 2.01, 6.99, 2.99 ], "texture": "#bars", "rotation": 180 },
"north": { "uv": [ 4.01, 2.01, 6.99, 3.99 ], "texture": "#bars", "cullface": "south" }
}
},
{
"__comment": "___tmp x16",
"from": [ 7, 1, 0.25 ],
"to": [ 9, 15, 1.25 ],
"faces": {
"north": { "uv": [ 7.01, 1.01, 8.99, 14.99 ], "texture": "#bars", "cullface": "south" },
"west": { "uv": [ 8.99, 1.01, 8.01, 14.99 ], "texture": "#bars" },
"east": { "uv": [ 7.01, 1.01, 7.99, 14.99 ], "texture": "#bars" }
}
},
{
"__comment": "___tmp x16",
"from": [ 4, 2, 0.25 ],
"to": [ 7, 4, 1.25 ],
"faces": {
"down": { "uv": [ 9.01, 13.99, 11.99, 13.01 ], "texture": "#bars", "rotation": 180 },
"up": { "uv": [ 9.01, 12.01, 11.99, 12.99 ], "texture": "#bars", "rotation": 180 },
"north": { "uv": [ 9.01, 12.01, 11.99, 13.99 ], "texture": "#bars", "cullface": "south" }
}
},
{
"__comment": "___tmp x16",
"from": [ 2, 1, 0.25 ],
"to": [ 4, 15, 1.25 ],
"faces": {
"north": { "uv": [ 12.01, 1.01, 13.99, 14.99 ], "texture": "#bars", "cullface": "south" },
"west": { "uv": [ 13.99, 1.01, 13.01, 14.99 ], "texture": "#bars" },
"east": { "uv": [ 12.01, 1.01, 12.99, 14.99 ], "texture": "#bars" }
}
},
{
"__comment": "___tmp x16",
"from": [ 1, 7, 0.25 ],
"to": [ 2, 9, 1.25 ],
"faces": {
"down": { "uv": [ 14.01, 8.99, 14.99, 8.01 ], "texture": "#bars", "rotation": 180 },
"up": { "uv": [ 14.01, 7.01, 14.99, 7.99 ], "texture": "#bars", "rotation": 180 },
"north": { "uv": [ 14.01, 7.01, 14.99, 8.99 ], "texture": "#bars", "cullface": "south" }
}
},
{
"__comment": "Chest",
"from": [ 0.25, 10.75, 1 ],
"to": [ 15.75, 15.75, 15.5 ],
"faces": {
"north": { "uv": [ 0, 3.5, 3.5, 4.75 ], "texture": "#chest" }
}
},
{
"__comment": "Chest",
"from": [ 0.25, 0.25, 1 ],
"to": [ 15.75, 10.75, 15.5 ],
"faces": {
"north": { "uv": [ 0, 8.25, 3.5, 10.75 ], "texture": "#chest" }
}
},
{
"from": [ 0.25, 0.25, 0.25 ],
"to": [ 15.75, 15.75, 15.75 ],
"faces": {
"down": { "uv": [ 0.25, 0.25, 15.75, 15.75 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0.25, 0.25, 15.75, 15.75 ], "texture": "#top", "cullface": "up" },
"west": { "uv": [ 0.25, 0.25, 15.75, 15.75 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0.25, 0.25, 15.75, 15.75 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 1, 16, 1 ],
"faces": {
"down": { "uv": [ 0, 15, 1, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 1, 1 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 15, 0, 16, 16 ], "texture": "#back", "cullface": "north" },
"south": { "uv": [ 0, 0, 1, 16 ], "texture": "#frontframe", "cullface": "west" },
"west": { "uv": [ 0, 0, 1, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 15, 0, 16, 16 ], "texture": "#side", "cullface": "north" }
}
},
{
"from": [ 15, 0, 0 ],
"to": [ 16, 16, 1 ],
"faces": {
"down": { "uv": [ 15, 15, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 15, 0, 16, 1 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 1, 16 ], "texture": "#back", "cullface": "north" },
"south": { "uv": [ 15, 0, 16, 16 ], "texture": "#frontframe", "cullface": "east" },
"west": { "uv": [ 0, 0, 1, 16 ], "texture": "#side", "cullface": "north" },
"east": { "uv": [ 15, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 15, 0, 15 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 15, 0, 16, 1 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 15, 15, 16, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 0, 0, 1, 16 ], "texture": "#back", "cullface": "east" },
"south": { "uv": [ 15, 0, 16, 16 ], "texture": "#frontframe", "cullface": "south" },
"west": { "uv": [ 15, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
"east": { "uv": [ 0, 0, 1, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 0, 0, 15 ],
"to": [ 1, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 1, 1 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 15, 1, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 15, 0, 16, 16 ], "texture": "#back", "cullface": "west" },
"south": { "uv": [ 0, 0, 1, 16 ], "texture": "#frontframe", "cullface": "south" },
"west": { "uv": [ 15, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 0, 1, 16 ], "texture": "#side", "cullface": "south" }
}
},
{
"from": [ 1, 0, 0 ],
"to": [ 15, 1, 1 ],
"faces": {
"down": { "uv": [ 1, 15, 15, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 1, 0, 15, 1 ], "texture": "#top", "cullface": "north" },
"north": { "uv": [ 1, 15, 15, 16 ], "texture": "#back", "cullface": "north" },
"south": { "uv": [ 1, 15, 15, 16 ], "texture": "#frontframe", "cullface": "down" }
}
},
{
"from": [ 1, 15, 0 ],
"to": [ 15, 16, 1 ],
"faces": {
"down": { "uv": [ 1, 15, 15, 16 ], "texture": "#bottom", "cullface": "north" },
"up": { "uv": [ 1, 0, 15, 1 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 1, 0, 15, 1 ], "texture": "#back", "cullface": "north" },
"south": { "uv": [ 1, 0, 15, 1 ], "texture": "#frontframe", "cullface": "up" }
}
},
{
"from": [ 1, 0, 15 ],
"to": [ 15, 1, 16 ],
"faces": {
"down": { "uv": [ 1, 0, 15, 1 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 1, 15, 15, 16 ], "texture": "#top", "cullface": "south" },
"north": { "uv": [ 1, 15, 15, 16 ], "texture": "#back", "cullface": "down" },
"south": { "uv": [ 1, 15, 15, 16 ], "texture": "#frontframe", "cullface": "south" }
}
},
{
"from": [ 1, 15, 15 ],
"to": [ 15, 16, 16 ],
"faces": {
"down": { "uv": [ 1, 0, 15, 1 ], "texture": "#bottom", "cullface": "south" },
"up": { "uv": [ 1, 15, 15, 16 ], "texture": "#top", "cullface": "up" },
"north": { "uv": [ 1, 0, 15, 1 ], "texture": "#back", "cullface": "up" },
"south": { "uv": [ 1, 0, 15, 1 ], "texture": "#frontframe", "cullface": "south" }
}
},
{
"from": [ 0, 0, 1 ],
"to": [ 1, 1, 15 ],
"faces": {
"down": { "uv": [ 0, 1, 1, 15 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 1, 1, 15 ], "texture": "#top", "cullface": "west" },
"west": { "uv": [ 1, 15, 15, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 1, 15, 15, 16 ], "texture": "#side", "cullface": "down" }
}
},
{
"from": [ 0, 15, 1 ],
"to": [ 1, 16, 15 ],
"faces": {
"down": { "uv": [ 0, 1, 1, 15 ], "texture": "#bottom", "cullface": "west" },
"up": { "uv": [ 0, 1, 1, 15 ], "texture": "#top", "cullface": "up" },
"west": { "uv": [ 1, 0, 15, 1 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 1, 0, 15, 1 ], "texture": "#side", "cullface": "up" }
}
},
{
"from": [ 15, 0, 1 ],
"to": [ 16, 1, 15 ],
"faces": {
"down": { "uv": [ 15, 1, 16, 15 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 15, 1, 16, 15 ], "texture": "#top", "cullface": "east" },
"west": { "uv": [ 1, 15, 15, 16 ], "texture": "#side", "cullface": "down" },
"east": { "uv": [ 1, 15, 15, 16 ], "texture": "#side", "cullface": "east" }
}
},
{
"from": [ 15, 15, 1 ],
"to": [ 16, 16, 15 ],
"faces": {
"down": { "uv": [ 15, 1, 16, 15 ], "texture": "#bottom", "cullface": "east" },
"up": { "uv": [ 15, 1, 16, 15 ], "texture": "#top", "cullface": "up" },
"west": { "uv": [ 1, 0, 15, 1 ], "texture": "#side", "cullface": "up" },
"east": { "uv": [ 1, 0, 15, 1 ], "texture": "#side", "cullface": "east" }
}
}
]
}
Loading

0 comments on commit 319e455

Please sign in to comment.