Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 15:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev

Browse source
This commit is contained in:
simibubi 2021-03-27 20:15:13 +01:00
commit 3dd199e9d9
6 changed files with 159 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/main/resources/assets/create/models/block/redstone_contact/block.json
View file

@ -1,81 +1,81 @@
{
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"particle": "create:block/contact_side",
"0": "create:block/brass_casing",
"0": "create:block/contact_front",
"1": "create:block/contact_side",
"2": "create:block/contact_front"
"3": "create:block/contact_back",
"particle": "create:block/contact_side"
},
"elements": [
{
"name": "Center",
"from": [ 2.0, 1.0, 2.0 ],
"to": [ 14.0, 15.0, 14.0 ],
"from": [2, 1, 2],
"to": [14, 15, 14],
"faces": {
"up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] },
"down": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }
"up": {"uv": [2, 2, 14, 14], "texture": "#0"},
"down": {"uv": [2, 2, 14, 14], "texture": "#3"}
}
},
{
"name": "Side",
"from": [ 0.0, 0.0, 0.0 ],
"to": [ 2.0, 16.0, 16.0 ],
"from": [0, 0, 0],
"to": [2, 16, 16],
"faces": {
"north": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] },
"east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] },
"west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] },
"down": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] }
"north": {"uv": [14, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 16], "texture": "#0"},
"down": {"uv": [0, 0, 2, 16], "texture": "#0"}
}
},
{
"name": "Side",
"from": [ 14.0, 0.0, 0.0 ],
"to": [ 16.0, 16.0, 16.0 ],
"from": [14, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] },
"east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"south": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] },
"west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
"up": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] },
"down": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] }
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [14, 0, 16, 16], "texture": "#1"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [14, 0, 16, 16], "texture": "#0"},
"down": {"uv": [14, 0, 16, 16], "texture": "#3"}
}
},
{
"name": "Short Side",
"from": [ 2.0, 0.0, 0.0 ],
"to": [ 14.0, 16.0, 2.0 ],
"from": [2, 0, 0],
"to": [14, 16, 2],
"faces": {
"north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
"south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
"up": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 2.0 ] },
"down": { "texture": "#1", "uv": [ 2.0, 14.0, 14.0, 16.0 ] }
"north": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [2, 0, 14, 2], "texture": "#0"},
"down": {"uv": [2, 14, 14, 16], "texture": "#3"}
}
},
{
"name": "Short Side",
"from": [ 2.0, 0.0, 14.0 ],
"to": [ 14.0, 16.0, 16.0 ],
"from": [2, 0, 14],
"to": [14, 16, 16],
"faces": {
"north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
"south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] },
"up": { "texture": "#1", "uv": [ 2.0, 14.0, 14.0, 16.0 ] },
"down": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 2.0 ] }
"north": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [2, 14, 14, 16], "texture": "#0"},
"down": {"uv": [2, 0, 14, 2], "texture": "#3"}
}
},
{
"name": "Contact",
"from": [ 6.0, 15.0, 6.0 ],
"to": [ 10.0, 16.0, 10.0 ],
"from": [6, 15, 6],
"to": [10, 16, 10],
"shade": false,
"faces": {
"north": { "texture": "#2", "uv": [ 6.0, 10.0, 10.0, 11.0 ] },
"east": { "texture": "#2", "uv": [ 10.0, 6.0, 11.0, 10.0 ], "rotation": 90 },
"south": { "texture": "#2", "uv": [ 5.0, 6.0, 6.0, 10.0 ], "rotation": 90 },
"west": { "texture": "#2", "uv": [ 6.0, 5.0, 10.0, 6.0 ] },
"up": { "texture": "#2", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }
"north": {"uv": [6, 6, 10, 7], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 6, 10, 10], "rotation": 90, "texture": "#0"},
"south": {"uv": [9, 6, 10, 10], "rotation": 270, "texture": "#0"},
"west": {"uv": [6, 6, 10, 7], "texture": "#0"},
"up": {"uv": [6, 6, 10, 10], "texture": "#0"}
}
}
]

81
src/main/resources/assets/create/models/block/redstone_contact/block_powered.json
View file

@ -1,7 +1,82 @@
{
"parent": "create:block/redstone_contact/block",
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"particle": "create:block/contact_side_powered",
"1": "create:block/contact_side_powered"
"0": "create:block/contact_front",
"1": "create:block/contact_side_powered",
"3": "create:block/contact_back",
"particle": "create:block/contact_side_powered"
},
"elements": [
{
"name": "Center",
"from": [2, 1, 2],
"to": [14, 15, 14],
"faces": {
"up": {"uv": [2, 2, 14, 14], "texture": "#0"},
"down": {"uv": [2, 2, 14, 14], "texture": "#3"}
}
},
{
"name": "Side",
"from": [0, 0, 0],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [14, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 2, 16], "texture": "#1"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 2, 16], "texture": "#0"},
"down": {"uv": [0, 0, 2, 16], "texture": "#0"}
}
},
{
"name": "Side",
"from": [14, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 16], "texture": "#1"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [14, 0, 16, 16], "texture": "#1"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [14, 0, 16, 16], "texture": "#0"},
"down": {"uv": [14, 0, 16, 16], "texture": "#3"}
}
},
{
"name": "Short Side",
"from": [2, 0, 0],
"to": [14, 16, 2],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [2, 0, 14, 2], "texture": "#0"},
"down": {"uv": [2, 14, 14, 16], "texture": "#3"}
}
},
{
"name": "Short Side",
"from": [2, 0, 14],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#1"},
"south": {"uv": [2, 0, 14, 16], "texture": "#1"},
"up": {"uv": [2, 14, 14, 16], "texture": "#0"},
"down": {"uv": [2, 0, 14, 2], "texture": "#3"}
}
},
{
"name": "Contact",
"from": [6, 15, 6],
"to": [10, 16, 10],
"shade": false,
"faces": {
"north": {"uv": [6, 6, 10, 7], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 6, 10, 10], "rotation": 90, "texture": "#0"},
"south": {"uv": [9, 6, 10, 10], "rotation": 270, "texture": "#0"},
"west": {"uv": [6, 6, 10, 7], "texture": "#0"},
"up": {"uv": [6, 6, 10, 10], "texture": "#0"}
}
}
]
}

BIN
src/main/resources/assets/create/textures/block/contact_back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 885 B

BIN
src/main/resources/assets/create/textures/block/contact_front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
src/main/resources/assets/create/textures/block/contact_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
src/main/resources/assets/create/textures/block/contact_side_powered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 898 B