From d1b0961cd11155d0058e3916a1fac63741e79f23 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 21 May 2025 20:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96hunting=20rifle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 5 +++- .../models/item/hunting_rifle.json | 28 ++++++++++++++++++ .../models/item/hunting_rifle_base.json | 2 +- .../models/item/hunting_rifle_icon.json | 2 +- .../datagen/ModItemModelProvider.java | 1 + .../models/item/hunting_rifle.json | 27 ----------------- .../hunting_rifle.json} | 4 +-- .../hunting_rifle.png} | Bin 8 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/hunting_rifle.json rename src/{main => generated}/resources/assets/superbwarfare/models/item/hunting_rifle_base.json (63%) rename src/{main => generated}/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json (65%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json rename src/main/resources/assets/superbwarfare/models/{item/hunting_rifle3d.json => lod/hunting_rifle.json} (98%) rename src/main/resources/assets/superbwarfare/textures/item/{hunting_rifle3d.png => lod/hunting_rifle.png} (100%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index fe76c5362..90169ed8f 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T21:35:27.2725955 Item Models: superbwarfare +// 1.21.1 2025-05-21T21:36:54.0073684 Item Models: superbwarfare 6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json @@ -75,7 +75,10 @@ f98cf49f8dea452a0fcc9bfc8fe9d02dcaa1a564 assets/superbwarfare/models/item/homema 3bce212de9120457cba07ffb5214d45af88d191b assets/superbwarfare/models/item/homemade_shotgun_base.json d7d1a02a23157105ef8691ad0eba016f0af92ab7 assets/superbwarfare/models/item/homemade_shotgun_icon.json a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/hpj_11_blueprint.json +665a8a7fc600e65a85d07b18f4c12fb916358b55 assets/superbwarfare/models/item/hunting_rifle.json +9bb0dce4eb911575ecbdfc1522d00112db0af5e7 assets/superbwarfare/models/item/hunting_rifle_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hunting_rifle_blueprint.json +44fb3218404452aa2479bde28785fcc4f56ef8b4 assets/superbwarfare/models/item/hunting_rifle_icon.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/insidious_blueprint.json 3c9dcc3393e16ca354b01162316f1ddae92338ec assets/superbwarfare/models/item/iron_action.json 6e7a2bd5ffb78bd218e3a55daba3e9c256470757 assets/superbwarfare/models/item/iron_barrel.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle.json b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle.json new file mode 100644 index 000000000..5a9efccf4 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/hunting_rifle_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/hunting_rifle" + }, + "ground": { + "parent": "superbwarfare:lod/hunting_rifle" + }, + "gui": { + "parent": "superbwarfare:item/hunting_rifle_icon" + }, + "head": { + "parent": "superbwarfare:lod/hunting_rifle" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/hunting_rifle" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/hunting_rifle" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle_base.json b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_base.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/hunting_rifle_base.json rename to src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_base.json index b5e705817..9e1f21ef7 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle_base.json +++ b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_base.json @@ -1,6 +1,6 @@ { "parent": "superbwarfare:displaysettings/hunting_rifle.item", "textures": { - "layer0": "superbwarfare:item/huntingrifle" + "layer0": "superbwarfare:item/hunting_rifle" } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json similarity index 65% rename from src/main/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json index 3effc16ba..1a7435300 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/hunting_rifle_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index de93f04fa..e648ae9bd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -37,6 +37,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.GLOCK_18, "glock_17"); gunItem(ModItems.HK_416); gunItem(ModItems.HOMEMADE_SHOTGUN); + gunItem(ModItems.HUNTING_RIFLE); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json b/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json deleted file mode 100644 index 8132e21f7..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/hunting_rifle_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/hunting_rifle_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/hunting_rifle3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/hunting_rifle3d" - }, - "ground": { - "parent": "superbwarfare:item/hunting_rifle3d" - }, - "fixed": { - "parent": "superbwarfare:item/hunting_rifle3d" - }, - "head": { - "parent": "superbwarfare:item/hunting_rifle3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle3d.json b/src/main/resources/assets/superbwarfare/models/lod/hunting_rifle.json similarity index 98% rename from src/main/resources/assets/superbwarfare/models/item/hunting_rifle3d.json rename to src/main/resources/assets/superbwarfare/models/lod/hunting_rifle.json index 0821aecbc..64f12e267 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/hunting_rifle.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "superbwarfare:item/hunting_rifle3d", - "particle": "superbwarfare:item/hunting_rifle3d" + "0": "superbwarfare:item/lod/hunting_rifle", + "particle": "superbwarfare:item/lod/hunting_rifle" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/hunting_rifle3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/hunting_rifle.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/hunting_rifle3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/hunting_rifle.png