Skip to content

Commit

Permalink
fixed some z-fighting, added particle models
Browse files Browse the repository at this point in the history
  • Loading branch information
Flubberschnub committed Aug 26, 2020
1 parent 1468bfe commit bfb0c34
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 8 deletions.
6 changes: 3 additions & 3 deletions assets/minecraft/models/item/jets/gen4/jet.json
Expand Up @@ -5227,7 +5227,7 @@
}
},
{
"from": [13.93525, 8.2795, 9.152],
"from": [13.93525, 8.3295, 9.152],
"to": [13.96225, 8.50325, 9.40325],
"rotation": {"angle": -22.5, "axis": "y", "origin": [14.05937, 8.26955, 9.321]},
"faces": {
Expand All @@ -5240,7 +5240,7 @@
}
},
{
"from": [2.03775, 8.2795, 9.152],
"from": [2.03775, 8.3295, 9.152],
"to": [2.06475, 8.50325, 9.40325],
"rotation": {"angle": 22.5, "axis": "y", "origin": [1.94063, 8.26955, 9.321]},
"faces": {
Expand All @@ -5266,7 +5266,7 @@
}
},
{
"from": [4.60025, 7.97, 17.3],
"from": [4.60025, 8.02, 17.3],
"to": [4.62725, 8.19375, 17.55125],
"rotation": {"angle": 22.5, "axis": "y", "origin": [4.50313, 7.9883, 17.47725]},
"faces": {
Expand Down
Expand Up @@ -5227,7 +5227,7 @@
}
},
{
"from": [13.93525, 8.2795, 9.152],
"from": [13.93525, 8.3795, 9.152],
"to": [13.96225, 8.50325, 9.40325],
"rotation": {"angle": -22.5, "axis": "y", "origin": [14.05937, 8.26955, 9.321]},
"faces": {
Expand All @@ -5240,7 +5240,7 @@
}
},
{
"from": [2.03775, 8.2795, 9.152],
"from": [2.03775, 8.3295, 9.152],
"to": [2.06475, 8.50325, 9.40325],
"rotation": {"angle": 22.5, "axis": "y", "origin": [1.94063, 8.26955, 9.321]},
"faces": {
Expand All @@ -5266,7 +5266,7 @@
}
},
{
"from": [4.60025, 7.97, 17.3],
"from": [4.60025, 8.02, 17.3],
"to": [4.62725, 8.19375, 17.55125],
"rotation": {"angle": 22.5, "axis": "y", "origin": [4.50313, 7.9883, 17.47725]},
"faces": {
Expand Down
3 changes: 2 additions & 1 deletion assets/minecraft/models/item/light_blue_dye.json
Expand Up @@ -7,6 +7,7 @@
"overrides": [
{"predicate": {"custom_model_data":1}, "model": "item/lightribbon/blue"},
{"predicate": {"custom_model_data":2}, "model": "item/lightribbon/horizontal/blue"},
{"predicate": {"custom_model_data":3}, "model": "item/bullet/blue"}
{"predicate": {"custom_model_data":3}, "model": "item/bullet/blue"},
{"predicate": {"custom_model_data":4}, "model": "item/particles/blue"}
]
}
3 changes: 2 additions & 1 deletion assets/minecraft/models/item/orange_dye.json
Expand Up @@ -7,6 +7,7 @@
"overrides": [
{"predicate": {"custom_model_data":1}, "model": "item/lightribbon/red"},
{"predicate": {"custom_model_data":2}, "model": "item/lightribbon/horizontal/red"},
{"predicate": {"custom_model_data":3}, "model": "item/bullet/red"}
{"predicate": {"custom_model_data":3}, "model": "item/bullet/red"},
{"predicate": {"custom_model_data":4}, "model": "item/particles/red"}
]
}
27 changes: 27 additions & 0 deletions assets/minecraft/models/item/particles/blue.json
@@ -0,0 +1,27 @@
{
"credit": "Made by Flubberschnub",
"textures": {
"0": "blocks/gen5/blueemitter",
"particle": "blocks/gen5/blueemitter"
},
"elements": [
{
"from": [-16, -16, -16],
"to": [32, 32, 32],
"faces": {
"north": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"east": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"south": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"west": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"up": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"down": {"uv": [4, 0, 5.5, 1], "texture": "#0"}
}
}
],
"display": {
"head": {
"translation": [0, -38.75, 0],
"scale": [4, 4, 4]
}
}
}
27 changes: 27 additions & 0 deletions assets/minecraft/models/item/particles/red.json
@@ -0,0 +1,27 @@
{
"credit": "Made by Flubberschnub",
"textures": {
"0": "blocks/gen5/redemitter",
"particle": "blocks/gen5/redemitter"
},
"elements": [
{
"from": [-16, -16, -16],
"to": [32, 32, 32],
"faces": {
"north": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"east": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"south": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"west": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"up": {"uv": [4, 0, 5.5, 1], "texture": "#0"},
"down": {"uv": [4, 0, 5.5, 1], "texture": "#0"}
}
}
],
"display": {
"head": {
"translation": [0, -38.75, 0],
"scale": [4, 4, 4]
}
}
}

0 comments on commit bfb0c34

Please sign in to comment.