Skip to content

Commit

Permalink
Added Muria Shell and finalized 3D Mask Model
Browse files Browse the repository at this point in the history
  • Loading branch information
JaegerwaldDev committed Dec 14, 2024
1 parent 7d22eb3 commit a363579
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class ModItemGroups {
entries.add(ModItems.MURIA_PLATE);
entries.add(ModItems.MURIA_RING);
entries.add(ModItems.PROCESSED_MURIA_PLATE);
entries.add(ModItems.MURIA_SHELL);

entries.add(ModItems.FENNEC_MASK);
entries.add(ModItems.REPLICA_WHISKERS);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/dev/jaegerwald/voidlings/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class ModItems {
public static final Item MURIA_PLATE = registerItem("muria_plate", new Item(new Item.Settings()));
public static final Item MURIA_RING = registerItem("muria_ring", new Item(new Item.Settings()));
public static final Item PROCESSED_MURIA_PLATE = registerItem("processed_muria_plate", new Item(new Item.Settings()));
public static final Item MURIA_SHELL = registerItem("muria_shell", new Item(new Item.Settings()));

public static final Item FENNEC_MASK = registerItem("fennec_mask", new FennecMaskItem(new Item.Settings()));
public static final Item REPLICA_WHISKERS = registerItem("replica_whiskers", new Item(new Item.Settings()));
Expand Down
23 changes: 12 additions & 11 deletions src/main/resources/assets/voidlings/models/item/fennec_mask.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,6 @@
"south": {"uv": [2.5, 7, 5, 11], "texture": "#0"}
}
},
{
"from": [6, 5.22625, 2.16478],
"to": [10, 8.22625, 4.16478],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 9.22625, 6.16478]},
"faces": {
"north": {"uv": [1, 12, 3, 13.5], "texture": "#0"},
"east": {"uv": [0, 12, 1, 13.5], "texture": "#0"},
"west": {"uv": [3, 12, 4, 13.5], "texture": "#0"},
"up": {"uv": [3, 12, 1, 11], "texture": "#0"}
}
},
{
"from": [4, 7, 6],
"to": [12, 8, 12],
Expand Down Expand Up @@ -87,6 +76,18 @@
"up": {"uv": [5, 1, 1, 0], "texture": "#0"},
"down": {"uv": [9, 0, 5, 1], "texture": "#0"}
}
},
{
"from": [6, 4, 3],
"to": [10, 7, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 4, 2]},
"faces": {
"north": {"uv": [0.5, 11.5, 2.5, 13], "texture": "#0"},
"east": {"uv": [0, 11.5, 0.5, 13], "texture": "#0"},
"west": {"uv": [2.5, 11.5, 3, 13], "texture": "#0"},
"up": {"uv": [0.5, 11, 2.5, 11.5], "texture": "#0"},
"down": {"uv": [2.5, 11, 4.5, 11.5], "texture": "#0"}
}
}
],
"display": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "voidlings:item/fennec_mask"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "voidlings:item/muria_shell"
}
}
Binary file modified src/main/resources/assets/voidlings/textures/item/fennec_mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/voidlings/textures/item/muria_ring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/main/resources/data/voidlings/recipe/muria_shell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" # ",
"###",
" # "
],
"key": {
"#": {
"item": "voidlings:processed_muria_plate"
}
},
"result": {
"id": "voidlings:muria_shell",
"count": 1
}
}

0 comments on commit a363579

Please sign in to comment.