diff --git a/src/main/resources/assets/webdisplays/models/block/ccinterface.json b/src/main/resources/assets/webdisplays/models/block/ccinterface.json index 643ca5b..0bf11c7 100644 --- a/src/main/resources/assets/webdisplays/models/block/ccinterface.json +++ b/src/main/resources/assets/webdisplays/models/block/ccinterface.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "top": "webdisplays:blocks/cci_topbot", - "front": "webdisplays:blocks/cci_front", - "side": "webdisplays:blocks/cci_side" + "top": "webdisplays:block/cci_topbot", + "front": "webdisplays:block/cci_front", + "side": "webdisplays:block/cci_side" } } diff --git a/src/main/resources/assets/webdisplays/models/block/kb_left.json b/src/main/resources/assets/webdisplays/models/block/kb_left.json index 331a9c2..0ac99d3 100644 --- a/src/main/resources/assets/webdisplays/models/block/kb_left.json +++ b/src/main/resources/assets/webdisplays/models/block/kb_left.json @@ -2,8 +2,8 @@ "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "particle": "webdisplays:blocks/kb_key", - "0": "webdisplays:blocks/kb_base", - "1": "webdisplays:blocks/kb_key" + "0": "webdisplays:block/kb_base", + "1": "webdisplays:block/kb_key" }, "elements": [ { diff --git a/src/main/resources/assets/webdisplays/models/block/kb_right.json b/src/main/resources/assets/webdisplays/models/block/kb_right.json index 05ce5ac..4de1514 100644 --- a/src/main/resources/assets/webdisplays/models/block/kb_right.json +++ b/src/main/resources/assets/webdisplays/models/block/kb_right.json @@ -1 +1 @@ -{"credit":"Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)","textures":{"0":"webdisplays:blocks/kb_base","1":"webdisplays:blocks/kb_key","particle":"webdisplays:blocks/kb_key"},"elements":[{"from":[0,0,3],"to":[16,1,16],"faces":{"north":{"uv":[0,0,16,1],"texture":"#0"},"east":{"uv":[0,0,13,1],"texture":"#0"},"south":{"uv":[0,0,16,1],"texture":"#0"},"west":{"uv":[0,0,13,1],"texture":"#0"},"up":{"uv":[0,0,16,13],"texture":"#0"},"down":{"uv":[0,0,16,13],"texture":"#0","cullface":"down"}}},{"from":[1,1,4],"to":[2,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,4],"to":[4,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,4],"to":[7,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,4],"to":[9,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[10,1,4],"to":[11,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[12,1,4],"to":[13,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[1,1,6],"to":[2,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,6],"to":[4,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[5,1,6],"to":[6,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[7,1,6],"to":[8,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[9,1,6],"to":[11,2,7],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[12,1,6],"to":[13,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,6],"to":[15,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,8],"to":[1,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[2,1,8],"to":[3,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[4,1,8],"to":[5,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,8],"to":[7,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,8],"to":[11,2,9],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}},{"from":[12,1,8],"to":[13,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,8],"to":[15,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[1,1,10],"to":[2,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,10],"to":[4,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[5,1,10],"to":[6,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[7,1,10],"to":[8,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[9,1,9],"to":[11,2,11],"faces":{"east":{"uv":[0,0,2,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,2,1],"texture":"#1"},"up":{"uv":[0,0,2,2],"texture":"#1"}}},{"from":[12,1,10],"to":[13,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,10],"to":[15,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,12],"to":[1,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[2,1,12],"to":[3,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[4,1,12],"to":[5,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,12],"to":[7,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,12],"to":[11,2,13],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}},{"from":[13,1,13],"to":[14,2,14],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,14],"to":[2,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[3,1,14],"to":[5,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[6,1,14],"to":[8,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[9,1,14],"to":[11,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[12,1,14],"to":[15,2,15],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}}]} \ No newline at end of file +{"credit":"Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)","textures":{"0":"webdisplays:block/kb_base","1":"webdisplays:block/kb_key","particle":"webdisplays:block/kb_key"},"elements":[{"from":[0,0,3],"to":[16,1,16],"faces":{"north":{"uv":[0,0,16,1],"texture":"#0"},"east":{"uv":[0,0,13,1],"texture":"#0"},"south":{"uv":[0,0,16,1],"texture":"#0"},"west":{"uv":[0,0,13,1],"texture":"#0"},"up":{"uv":[0,0,16,13],"texture":"#0"},"down":{"uv":[0,0,16,13],"texture":"#0","cullface":"down"}}},{"from":[1,1,4],"to":[2,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,4],"to":[4,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,4],"to":[7,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,4],"to":[9,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[10,1,4],"to":[11,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[12,1,4],"to":[13,2,5],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[1,1,6],"to":[2,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,6],"to":[4,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[5,1,6],"to":[6,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[7,1,6],"to":[8,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[9,1,6],"to":[11,2,7],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[12,1,6],"to":[13,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,6],"to":[15,2,7],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,8],"to":[1,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[2,1,8],"to":[3,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[4,1,8],"to":[5,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,8],"to":[7,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,8],"to":[11,2,9],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}},{"from":[12,1,8],"to":[13,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,8],"to":[15,2,9],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[1,1,10],"to":[2,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[3,1,10],"to":[4,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[5,1,10],"to":[6,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[7,1,10],"to":[8,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[9,1,9],"to":[11,2,11],"faces":{"east":{"uv":[0,0,2,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,2,1],"texture":"#1"},"up":{"uv":[0,0,2,2],"texture":"#1"}}},{"from":[12,1,10],"to":[13,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[14,1,10],"to":[15,2,11],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,12],"to":[1,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[2,1,12],"to":[3,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[4,1,12],"to":[5,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[6,1,12],"to":[7,2,13],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[8,1,12],"to":[11,2,13],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}},{"from":[13,1,13],"to":[14,2,14],"faces":{"north":{"uv":[0,0,1,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,1,1],"texture":"#1"}}},{"from":[0,1,14],"to":[2,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[3,1,14],"to":[5,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[6,1,14],"to":[8,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[9,1,14],"to":[11,2,15],"faces":{"north":{"uv":[0,0,2,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,2,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,2,1],"texture":"#1"}}},{"from":[12,1,14],"to":[15,2,15],"faces":{"north":{"uv":[0,0,3,1],"texture":"#1"},"east":{"uv":[0,0,1,1],"texture":"#1"},"south":{"uv":[0,0,3,1],"texture":"#1"},"west":{"uv":[0,0,1,1],"texture":"#1"},"up":{"uv":[0,0,3,1],"texture":"#1"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/webdisplays/models/block/ocinterface.json b/src/main/resources/assets/webdisplays/models/block/ocinterface.json index 0cdb319..1cf6e93 100644 --- a/src/main/resources/assets/webdisplays/models/block/ocinterface.json +++ b/src/main/resources/assets/webdisplays/models/block/ocinterface.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "top": "webdisplays:blocks/oci_topbot", - "front": "webdisplays:blocks/oci_front", - "side": "webdisplays:blocks/oci_side" + "top": "webdisplays:block/oci_topbot", + "front": "webdisplays:block/oci_front", + "side": "webdisplays:block/oci_side" } } diff --git a/src/main/resources/assets/webdisplays/models/block/rctrl.json b/src/main/resources/assets/webdisplays/models/block/rctrl.json index 2401660..1dd0f09 100644 --- a/src/main/resources/assets/webdisplays/models/block/rctrl.json +++ b/src/main/resources/assets/webdisplays/models/block/rctrl.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "webdisplays:blocks/rctrl" + "all": "webdisplays:block/rctrl" } } diff --git a/src/main/resources/assets/webdisplays/models/block/redctrl.json b/src/main/resources/assets/webdisplays/models/block/redctrl.json index bf34100..c6d5dab 100644 --- a/src/main/resources/assets/webdisplays/models/block/redctrl.json +++ b/src/main/resources/assets/webdisplays/models/block/redctrl.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "webdisplays:blocks/redctrl" + "all": "webdisplays:block/redctrl" } } diff --git a/src/main/resources/assets/webdisplays/models/block/screen_item.json b/src/main/resources/assets/webdisplays/models/block/screen_item.json index f8e03ca..983f235 100644 --- a/src/main/resources/assets/webdisplays/models/block/screen_item.json +++ b/src/main/resources/assets/webdisplays/models/block/screen_item.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "webdisplays:blocks/screen15" + "all": "webdisplays:block/screen15" } } diff --git a/src/main/resources/assets/webdisplays/models/block/server.json b/src/main/resources/assets/webdisplays/models/block/server.json index b08e2f4..323143c 100644 --- a/src/main/resources/assets/webdisplays/models/block/server.json +++ b/src/main/resources/assets/webdisplays/models/block/server.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "webdisplays:blocks/server", - "down": "webdisplays:blocks/server2", - "up": "webdisplays:blocks/server2", - "north": "webdisplays:blocks/server", - "east": "webdisplays:blocks/server", - "south": "webdisplays:blocks/server", - "west": "webdisplays:blocks/server" + "particle": "webdisplays:block/server", + "down": "webdisplays:block/server2", + "up": "webdisplays:block/server2", + "north": "webdisplays:block/server", + "east": "webdisplays:block/server", + "south": "webdisplays:block/server", + "west": "webdisplays:block/server" } } diff --git a/src/main/resources/assets/webdisplays/models/item/advicon_brokenpad.json b/src/main/resources/assets/webdisplays/models/item/advicon_brokenpad.json index fdb78e7..31a7f0d 100644 --- a/src/main/resources/assets/webdisplays/models/item/advicon_brokenpad.json +++ b/src/main/resources/assets/webdisplays/models/item/advicon_brokenpad.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/advicon_brokenpad" + "layer0": "webdisplays:item/advicon_brokenpad" } } diff --git a/src/main/resources/assets/webdisplays/models/item/advicon_pigeon.json b/src/main/resources/assets/webdisplays/models/item/advicon_pigeon.json index fcdf562..a463266 100644 --- a/src/main/resources/assets/webdisplays/models/item/advicon_pigeon.json +++ b/src/main/resources/assets/webdisplays/models/item/advicon_pigeon.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/advicon_pigeon" + "layer0": "webdisplays:item/advicon_pigeon" } } diff --git a/src/main/resources/assets/webdisplays/models/item/advicon_wd.json b/src/main/resources/assets/webdisplays/models/item/advicon_wd.json index 01dbab3..4a5a462 100644 --- a/src/main/resources/assets/webdisplays/models/item/advicon_wd.json +++ b/src/main/resources/assets/webdisplays/models/item/advicon_wd.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/advicon_wd" + "layer0": "webdisplays:item/advicon_wd" } } diff --git a/src/main/resources/assets/webdisplays/models/item/ccinterface.json b/src/main/resources/assets/webdisplays/models/item/ccinterface.json index 643ca5b..0bf11c7 100644 --- a/src/main/resources/assets/webdisplays/models/item/ccinterface.json +++ b/src/main/resources/assets/webdisplays/models/item/ccinterface.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "top": "webdisplays:blocks/cci_topbot", - "front": "webdisplays:blocks/cci_front", - "side": "webdisplays:blocks/cci_side" + "top": "webdisplays:block/cci_topbot", + "front": "webdisplays:block/cci_front", + "side": "webdisplays:block/cci_side" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_backlight.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_backlight.json index adfef2b..3159616 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_backlight.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_backlight.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/backlight" + "layer0": "webdisplays:item/backlight" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_badextcard.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_badextcard.json index b983a3c..8e715cd 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_badextcard.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_badextcard.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/badextcard" + "layer0": "webdisplays:item/badextcard" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_batcell.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_batcell.json index 7054961..fd66296 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_batcell.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_batcell.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/batcell" + "layer0": "webdisplays:item/batcell" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_batpack.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_batpack.json index 92ca019..3c9caff 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_batpack.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_batpack.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/batpack" + "layer0": "webdisplays:item/batpack" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_extcard.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_extcard.json index 2327737..78a378c 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_extcard.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_extcard.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/extcard" + "layer0": "webdisplays:item/extcard" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_laserdiode.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_laserdiode.json index 90f8042..b1de9ba 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_laserdiode.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_laserdiode.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/laserdiode" + "layer0": "webdisplays:item/laserdiode" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral.json index 16c74aa..ef7a036 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_peripheral.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/peripheral" + "layer0": "webdisplays:item/peripheral" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_stonekey.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_stonekey.json index 2fc5b1f..a561365 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_stonekey.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_stonekey.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/stonekey" + "layer0": "webdisplays:item/stonekey" } } diff --git a/src/main/resources/assets/webdisplays/models/item/craftcomp_upgrade.json b/src/main/resources/assets/webdisplays/models/item/craftcomp_upgrade.json index 2504dd8..81c8f36 100644 --- a/src/main/resources/assets/webdisplays/models/item/craftcomp_upgrade.json +++ b/src/main/resources/assets/webdisplays/models/item/craftcomp_upgrade.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/upgrade" + "layer0": "webdisplays:item/upgrade" } } diff --git a/src/main/resources/assets/webdisplays/models/item/kb_left.json b/src/main/resources/assets/webdisplays/models/item/kb_left.json index 331a9c2..d0a3c75 100644 --- a/src/main/resources/assets/webdisplays/models/item/kb_left.json +++ b/src/main/resources/assets/webdisplays/models/item/kb_left.json @@ -1,9 +1,9 @@ { "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "particle": "webdisplays:blocks/kb_key", - "0": "webdisplays:blocks/kb_base", - "1": "webdisplays:blocks/kb_key" + "particle": "webdisplays:block/kb_key", + "0": "webdisplays:block/kb_base", + "1": "webdisplays:block/kb_key" }, "elements": [ { diff --git a/src/main/resources/assets/webdisplays/models/item/kb_right.json b/src/main/resources/assets/webdisplays/models/item/kb_right.json index eeaba91..3784bdf 100644 --- a/src/main/resources/assets/webdisplays/models/item/kb_right.json +++ b/src/main/resources/assets/webdisplays/models/item/kb_right.json @@ -1,9 +1,9 @@ { "__comment": "Model absolutely not generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "particle": "webdisplays:blocks/kb_key", - "0": "webdisplays:blocks/kb_base", - "1": "webdisplays:blocks/kb_key" + "particle": "webdisplays:block/kb_key", + "0": "webdisplays:block/kb_base", + "1": "webdisplays:block/kb_key" }, "elements": [ { diff --git a/src/main/resources/assets/webdisplays/models/item/keyboard.json b/src/main/resources/assets/webdisplays/models/item/keyboard.json index f64b95f..223dc48 100644 --- a/src/main/resources/assets/webdisplays/models/item/keyboard.json +++ b/src/main/resources/assets/webdisplays/models/item/keyboard.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/kb_inv" + "layer0": "webdisplays:item/kb_inv" } } diff --git a/src/main/resources/assets/webdisplays/models/item/laserpointer.json b/src/main/resources/assets/webdisplays/models/item/laserpointer.json index b6b74c0..4b9d87f 100644 --- a/src/main/resources/assets/webdisplays/models/item/laserpointer.json +++ b/src/main/resources/assets/webdisplays/models/item/laserpointer.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/laserpointer" + "layer0": "webdisplays:item/laserpointer" } } diff --git a/src/main/resources/assets/webdisplays/models/item/linker.json b/src/main/resources/assets/webdisplays/models/item/linker.json index 61e85dd..33051c0 100644 --- a/src/main/resources/assets/webdisplays/models/item/linker.json +++ b/src/main/resources/assets/webdisplays/models/item/linker.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/linker" + "layer0": "webdisplays:item/linker" } } diff --git a/src/main/resources/assets/webdisplays/models/item/ocinterface.json b/src/main/resources/assets/webdisplays/models/item/ocinterface.json index 0cdb319..1cf6e93 100644 --- a/src/main/resources/assets/webdisplays/models/item/ocinterface.json +++ b/src/main/resources/assets/webdisplays/models/item/ocinterface.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "top": "webdisplays:blocks/oci_topbot", - "front": "webdisplays:blocks/oci_front", - "side": "webdisplays:blocks/oci_side" + "top": "webdisplays:block/oci_topbot", + "front": "webdisplays:block/oci_front", + "side": "webdisplays:block/oci_side" } } diff --git a/src/main/resources/assets/webdisplays/models/item/ownerthief.json b/src/main/resources/assets/webdisplays/models/item/ownerthief.json index fbaa5bd..3a0074e 100644 --- a/src/main/resources/assets/webdisplays/models/item/ownerthief.json +++ b/src/main/resources/assets/webdisplays/models/item/ownerthief.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/ownerthief" + "layer0": "webdisplays:item/ownerthief" } } diff --git a/src/main/resources/assets/webdisplays/models/item/rctrl.json b/src/main/resources/assets/webdisplays/models/item/rctrl.json index 2401660..1dd0f09 100644 --- a/src/main/resources/assets/webdisplays/models/item/rctrl.json +++ b/src/main/resources/assets/webdisplays/models/item/rctrl.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "webdisplays:blocks/rctrl" + "all": "webdisplays:block/rctrl" } } diff --git a/src/main/resources/assets/webdisplays/models/item/redctrl.json b/src/main/resources/assets/webdisplays/models/item/redctrl.json index bf34100..c6d5dab 100644 --- a/src/main/resources/assets/webdisplays/models/item/redctrl.json +++ b/src/main/resources/assets/webdisplays/models/item/redctrl.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "webdisplays:blocks/redctrl" + "all": "webdisplays:block/redctrl" } } diff --git a/src/main/resources/assets/webdisplays/models/item/screen.json b/src/main/resources/assets/webdisplays/models/item/screen.json index f8e03ca..983f235 100644 --- a/src/main/resources/assets/webdisplays/models/item/screen.json +++ b/src/main/resources/assets/webdisplays/models/item/screen.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "webdisplays:blocks/screen15" + "all": "webdisplays:block/screen15" } } diff --git a/src/main/resources/assets/webdisplays/models/item/screencfg.json b/src/main/resources/assets/webdisplays/models/item/screencfg.json index c313b6d..e7aa08a 100644 --- a/src/main/resources/assets/webdisplays/models/item/screencfg.json +++ b/src/main/resources/assets/webdisplays/models/item/screencfg.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/screencfg" + "layer0": "webdisplays:item/screencfg" } } diff --git a/src/main/resources/assets/webdisplays/models/item/server.json b/src/main/resources/assets/webdisplays/models/item/server.json index b08e2f4..323143c 100644 --- a/src/main/resources/assets/webdisplays/models/item/server.json +++ b/src/main/resources/assets/webdisplays/models/item/server.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "particle": "webdisplays:blocks/server", - "down": "webdisplays:blocks/server2", - "up": "webdisplays:blocks/server2", - "north": "webdisplays:blocks/server", - "east": "webdisplays:blocks/server", - "south": "webdisplays:blocks/server", - "west": "webdisplays:blocks/server" + "particle": "webdisplays:block/server", + "down": "webdisplays:block/server2", + "up": "webdisplays:block/server2", + "north": "webdisplays:block/server", + "east": "webdisplays:block/server", + "south": "webdisplays:block/server", + "west": "webdisplays:block/server" } } diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_gps.json b/src/main/resources/assets/webdisplays/models/item/upgrade_gps.json index 26c9b55..b71540a 100644 --- a/src/main/resources/assets/webdisplays/models/item/upgrade_gps.json +++ b/src/main/resources/assets/webdisplays/models/item/upgrade_gps.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/upgrade", - "layer1": "webdisplays:items/gps" + "layer0": "webdisplays:item/upgrade", + "layer1": "webdisplays:item/gps" } } diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_lasermouse.json b/src/main/resources/assets/webdisplays/models/item/upgrade_lasermouse.json index 0d70e0c..5b4f376 100644 --- a/src/main/resources/assets/webdisplays/models/item/upgrade_lasermouse.json +++ b/src/main/resources/assets/webdisplays/models/item/upgrade_lasermouse.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/upgrade", - "layer1": "webdisplays:items/laserpointer2" + "layer0": "webdisplays:item/upgrade", + "layer1": "webdisplays:item/laserpointer2" } } diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_redinput.json b/src/main/resources/assets/webdisplays/models/item/upgrade_redinput.json index b869d83..a5dbcda 100644 --- a/src/main/resources/assets/webdisplays/models/item/upgrade_redinput.json +++ b/src/main/resources/assets/webdisplays/models/item/upgrade_redinput.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/upgrade", - "layer1": "webdisplays:items/input" + "layer0": "webdisplays:item/upgrade", + "layer1": "webdisplays:item/input" } } diff --git a/src/main/resources/assets/webdisplays/models/item/upgrade_redoutput.json b/src/main/resources/assets/webdisplays/models/item/upgrade_redoutput.json index e9d9ebd..634c01e 100644 --- a/src/main/resources/assets/webdisplays/models/item/upgrade_redoutput.json +++ b/src/main/resources/assets/webdisplays/models/item/upgrade_redoutput.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "webdisplays:items/upgrade", - "layer1": "webdisplays:items/output" + "layer0": "webdisplays:item/upgrade", + "layer1": "webdisplays:item/output" } } diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_front.png b/src/main/resources/assets/webdisplays/textures/block/cci_front.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/cci_front.png rename to src/main/resources/assets/webdisplays/textures/block/cci_front.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_side.png b/src/main/resources/assets/webdisplays/textures/block/cci_side.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/cci_side.png rename to src/main/resources/assets/webdisplays/textures/block/cci_side.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_topbot.png b/src/main/resources/assets/webdisplays/textures/block/cci_topbot.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/cci_topbot.png rename to src/main/resources/assets/webdisplays/textures/block/cci_topbot.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/kb_base.png b/src/main/resources/assets/webdisplays/textures/block/kb_base.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/kb_base.png rename to src/main/resources/assets/webdisplays/textures/block/kb_base.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/kb_key.png b/src/main/resources/assets/webdisplays/textures/block/kb_key.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/kb_key.png rename to src/main/resources/assets/webdisplays/textures/block/kb_key.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_front.png b/src/main/resources/assets/webdisplays/textures/block/oci_front.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/oci_front.png rename to src/main/resources/assets/webdisplays/textures/block/oci_front.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_side.png b/src/main/resources/assets/webdisplays/textures/block/oci_side.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/oci_side.png rename to src/main/resources/assets/webdisplays/textures/block/oci_side.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_topbot.png b/src/main/resources/assets/webdisplays/textures/block/oci_topbot.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/oci_topbot.png rename to src/main/resources/assets/webdisplays/textures/block/oci_topbot.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/rctrl.png b/src/main/resources/assets/webdisplays/textures/block/rctrl.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/rctrl.png rename to src/main/resources/assets/webdisplays/textures/block/rctrl.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/redctrl.png b/src/main/resources/assets/webdisplays/textures/block/redctrl.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/redctrl.png rename to src/main/resources/assets/webdisplays/textures/block/redctrl.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen0.png b/src/main/resources/assets/webdisplays/textures/block/screen0.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen0.png rename to src/main/resources/assets/webdisplays/textures/block/screen0.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen1.png b/src/main/resources/assets/webdisplays/textures/block/screen1.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen1.png rename to src/main/resources/assets/webdisplays/textures/block/screen1.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen10.png b/src/main/resources/assets/webdisplays/textures/block/screen10.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen10.png rename to src/main/resources/assets/webdisplays/textures/block/screen10.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen11.png b/src/main/resources/assets/webdisplays/textures/block/screen11.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen11.png rename to src/main/resources/assets/webdisplays/textures/block/screen11.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen12.png b/src/main/resources/assets/webdisplays/textures/block/screen12.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen12.png rename to src/main/resources/assets/webdisplays/textures/block/screen12.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen13.png b/src/main/resources/assets/webdisplays/textures/block/screen13.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen13.png rename to src/main/resources/assets/webdisplays/textures/block/screen13.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen14.png b/src/main/resources/assets/webdisplays/textures/block/screen14.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen14.png rename to src/main/resources/assets/webdisplays/textures/block/screen14.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen15.png b/src/main/resources/assets/webdisplays/textures/block/screen15.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen15.png rename to src/main/resources/assets/webdisplays/textures/block/screen15.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen2.png b/src/main/resources/assets/webdisplays/textures/block/screen2.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen2.png rename to src/main/resources/assets/webdisplays/textures/block/screen2.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen3.png b/src/main/resources/assets/webdisplays/textures/block/screen3.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen3.png rename to src/main/resources/assets/webdisplays/textures/block/screen3.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen4.png b/src/main/resources/assets/webdisplays/textures/block/screen4.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen4.png rename to src/main/resources/assets/webdisplays/textures/block/screen4.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen5.png b/src/main/resources/assets/webdisplays/textures/block/screen5.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen5.png rename to src/main/resources/assets/webdisplays/textures/block/screen5.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen6.png b/src/main/resources/assets/webdisplays/textures/block/screen6.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen6.png rename to src/main/resources/assets/webdisplays/textures/block/screen6.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen7.png b/src/main/resources/assets/webdisplays/textures/block/screen7.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen7.png rename to src/main/resources/assets/webdisplays/textures/block/screen7.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen8.png b/src/main/resources/assets/webdisplays/textures/block/screen8.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen8.png rename to src/main/resources/assets/webdisplays/textures/block/screen8.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/screen9.png b/src/main/resources/assets/webdisplays/textures/block/screen9.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/screen9.png rename to src/main/resources/assets/webdisplays/textures/block/screen9.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/server.png b/src/main/resources/assets/webdisplays/textures/block/server.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/server.png rename to src/main/resources/assets/webdisplays/textures/block/server.png diff --git a/src/main/resources/assets/webdisplays/textures/blocks/server2.png b/src/main/resources/assets/webdisplays/textures/block/server2.png similarity index 100% rename from src/main/resources/assets/webdisplays/textures/blocks/server2.png rename to src/main/resources/assets/webdisplays/textures/block/server2.png