diff --git a/src/generated/resources/assets/superbwarfare/models/item/trachelium.json b/src/generated/resources/assets/superbwarfare/models/item/trachelium.json new file mode 100644 index 000000000..78f24c0e4 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/trachelium.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/trachelium_base" + }, + "gui_light": "front", + "loader": "forge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/trachelium" + }, + "ground": { + "parent": "superbwarfare:lod/trachelium" + }, + "gui": { + "parent": "superbwarfare:item/trachelium_icon" + }, + "head": { + "parent": "superbwarfare:lod/trachelium" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/trachelium" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/trachelium" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/trachelium_base.json b/src/generated/resources/assets/superbwarfare/models/item/trachelium_base.json similarity index 60% rename from src/main/resources/assets/superbwarfare/models/item/trachelium_base.json rename to src/generated/resources/assets/superbwarfare/models/item/trachelium_base.json index a57eefb35..4c50e9c65 100644 --- a/src/main/resources/assets/superbwarfare/models/item/trachelium_base.json +++ b/src/generated/resources/assets/superbwarfare/models/item/trachelium_base.json @@ -1,6 +1,6 @@ { "parent": "superbwarfare:displaysettings/trachelium.item", "textures": { - "layer0": "superbwarfare:item/trachelium_texture" + "layer0": "superbwarfare:item/trachelium" } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/trachelium_icon.json b/src/generated/resources/assets/superbwarfare/models/item/trachelium_icon.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/trachelium_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/trachelium_icon.json index 27f0c3416..c7a60e644 100644 --- a/src/main/resources/assets/superbwarfare/models/item/trachelium_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/trachelium_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/trachelium_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java index 84e56d33a..f26dbc6b5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TracheliumItemModel.java @@ -42,7 +42,7 @@ public class TracheliumItemModel extends GeoModel { @Override public ResourceLocation getTextureResource(Trachelium animatable) { - return Mod.loc("textures/item/trachelium_texture.png"); + return Mod.loc("textures/item/trachelium.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 8a4595b92..f033c0518 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -61,6 +61,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.SKS); gunItem(ModItems.SVD); gunItem(ModItems.TASER); + gunItem(ModItems.TRACHELIUM); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/item/trachelium.json b/src/main/resources/assets/superbwarfare/models/item/trachelium.json deleted file mode 100644 index f7fb02958..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/trachelium.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/trachelium_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/trachelium_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/trachelium3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/trachelium3d" - }, - "ground": { - "parent": "superbwarfare:item/trachelium3d" - }, - "fixed": { - "parent": "superbwarfare:item/trachelium3d" - }, - "head": { - "parent": "superbwarfare:item/trachelium3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/trachelium3d.json b/src/main/resources/assets/superbwarfare/models/lod/trachelium.json similarity index 96% rename from src/main/resources/assets/superbwarfare/models/item/trachelium3d.json rename to src/main/resources/assets/superbwarfare/models/lod/trachelium.json index bafbc6575..6f2973786 100644 --- a/src/main/resources/assets/superbwarfare/models/item/trachelium3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/trachelium.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "superbwarfare:item/trachelium3d", - "particle": "superbwarfare:item/trachelium3d" + "0": "superbwarfare:item/lod/trachelium", + "particle": "superbwarfare:item/lod/trachelium" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/trachelium3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/trachelium.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/trachelium3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/trachelium.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/trachelium_texture.png b/src/main/resources/assets/superbwarfare/textures/item/trachelium.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/trachelium_texture.png rename to src/main/resources/assets/superbwarfare/textures/item/trachelium.png