From bfb0c34c8dae336fbdf49242c94a9e866ad6cf85 Mon Sep 17 00:00:00 2001 From: Flubberschnub Date: Wed, 26 Aug 2020 16:16:06 -0700 Subject: [PATCH] fixed some z-fighting, added particle models --- .../minecraft/models/item/jets/gen4/jet.json | 6 ++--- .../jets/gen4/variants/blackguard/jet.json | 6 ++--- .../minecraft/models/item/light_blue_dye.json | 3 ++- assets/minecraft/models/item/orange_dye.json | 3 ++- .../minecraft/models/item/particles/blue.json | 27 +++++++++++++++++++ .../minecraft/models/item/particles/red.json | 27 +++++++++++++++++++ 6 files changed, 64 insertions(+), 8 deletions(-) create mode 100644 assets/minecraft/models/item/particles/blue.json create mode 100644 assets/minecraft/models/item/particles/red.json diff --git a/assets/minecraft/models/item/jets/gen4/jet.json b/assets/minecraft/models/item/jets/gen4/jet.json index ed6bbeb..eb51868 100644 --- a/assets/minecraft/models/item/jets/gen4/jet.json +++ b/assets/minecraft/models/item/jets/gen4/jet.json @@ -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": { @@ -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": { @@ -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": { diff --git a/assets/minecraft/models/item/jets/gen4/variants/blackguard/jet.json b/assets/minecraft/models/item/jets/gen4/variants/blackguard/jet.json index 494f816..3219dbe 100644 --- a/assets/minecraft/models/item/jets/gen4/variants/blackguard/jet.json +++ b/assets/minecraft/models/item/jets/gen4/variants/blackguard/jet.json @@ -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": { @@ -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": { @@ -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": { diff --git a/assets/minecraft/models/item/light_blue_dye.json b/assets/minecraft/models/item/light_blue_dye.json index 2f83b75..33362f8 100644 --- a/assets/minecraft/models/item/light_blue_dye.json +++ b/assets/minecraft/models/item/light_blue_dye.json @@ -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"} ] } diff --git a/assets/minecraft/models/item/orange_dye.json b/assets/minecraft/models/item/orange_dye.json index d668d14..c2a00fd 100644 --- a/assets/minecraft/models/item/orange_dye.json +++ b/assets/minecraft/models/item/orange_dye.json @@ -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"} ] } diff --git a/assets/minecraft/models/item/particles/blue.json b/assets/minecraft/models/item/particles/blue.json new file mode 100644 index 0000000..e25032c --- /dev/null +++ b/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] + } + } +} \ No newline at end of file diff --git a/assets/minecraft/models/item/particles/red.json b/assets/minecraft/models/item/particles/red.json new file mode 100644 index 0000000..a98079b --- /dev/null +++ b/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] + } + } +} \ No newline at end of file