From ac0a51056a7ba3d391e31d285e0f3fa24dc58758 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 21 May 2025 20:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E9=98=B4=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 5 +++- .../superbwarfare/models/item/insidious.json | 28 ++++++++++++++++++ .../models/item/insidious_base.json | 0 .../models/item/insidious_icon.json | 2 +- .../datagen/ModItemModelProvider.java | 1 + .../superbwarfare/models/item/insidious.json | 27 ----------------- .../insidious_3d.json => lod/insidious.json} | 4 +-- .../{insidious_3d.png => lod/insidious.png} | Bin 8 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/insidious.json rename src/{main => generated}/resources/assets/superbwarfare/models/item/insidious_base.json (100%) rename src/{main => generated}/resources/assets/superbwarfare/models/item/insidious_icon.json (64%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/insidious.json rename src/main/resources/assets/superbwarfare/models/{item/insidious_3d.json => lod/insidious.json} (99%) rename src/main/resources/assets/superbwarfare/textures/item/{insidious_3d.png => lod/insidious.png} (100%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 90169ed8f..ae7ea9a5c 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T21:36:54.0073684 Item Models: superbwarfare +// 1.21.1 2025-05-21T21:38:29.0648576 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 @@ -79,7 +79,10 @@ a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/hpj_11 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 +6af52a92a5725ed2419a58a57cd7bb165f18e96a assets/superbwarfare/models/item/insidious.json +984f211837d1de76f5266f20fe1268c25331e978 assets/superbwarfare/models/item/insidious_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/insidious_blueprint.json +61f2600761b2088d2ea257295fd52e78222f588e assets/superbwarfare/models/item/insidious_icon.json 3c9dcc3393e16ca354b01162316f1ddae92338ec assets/superbwarfare/models/item/iron_action.json 6e7a2bd5ffb78bd218e3a55daba3e9c256470757 assets/superbwarfare/models/item/iron_barrel.json e04bbd61e716fc5d53c9425aba508fc3287bfd57 assets/superbwarfare/models/item/iron_powder.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/insidious.json b/src/generated/resources/assets/superbwarfare/models/item/insidious.json new file mode 100644 index 000000000..e020f7295 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/insidious.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/insidious_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/insidious" + }, + "ground": { + "parent": "superbwarfare:lod/insidious" + }, + "gui": { + "parent": "superbwarfare:item/insidious_icon" + }, + "head": { + "parent": "superbwarfare:lod/insidious" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/insidious" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/insidious" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/insidious_base.json b/src/generated/resources/assets/superbwarfare/models/item/insidious_base.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/insidious_base.json rename to src/generated/resources/assets/superbwarfare/models/item/insidious_base.json diff --git a/src/main/resources/assets/superbwarfare/models/item/insidious_icon.json b/src/generated/resources/assets/superbwarfare/models/item/insidious_icon.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/insidious_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/insidious_icon.json index 5045829a8..f24927a30 100644 --- a/src/main/resources/assets/superbwarfare/models/item/insidious_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/insidious_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/insidious_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index e648ae9bd..9f725be9e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -38,6 +38,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.HK_416); gunItem(ModItems.HOMEMADE_SHOTGUN); gunItem(ModItems.HUNTING_RIFLE); + gunItem(ModItems.INSIDIOUS); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/item/insidious.json b/src/main/resources/assets/superbwarfare/models/item/insidious.json deleted file mode 100644 index c71dc7693..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/insidious.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/insidious_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/insidious_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/insidious_3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/insidious_3d" - }, - "ground": { - "parent": "superbwarfare:item/insidious_3d" - }, - "fixed": { - "parent": "superbwarfare:item/insidious_3d" - }, - "head": { - "parent": "superbwarfare:item/insidious_3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/insidious_3d.json b/src/main/resources/assets/superbwarfare/models/lod/insidious.json similarity index 99% rename from src/main/resources/assets/superbwarfare/models/item/insidious_3d.json rename to src/main/resources/assets/superbwarfare/models/lod/insidious.json index 473497973..8b149e5ec 100644 --- a/src/main/resources/assets/superbwarfare/models/item/insidious_3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/insidious.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "superbwarfare:item/insidious_3d", - "particle": "superbwarfare:item/insidious_3d" + "0": "superbwarfare:item/lod/insidious", + "particle": "superbwarfare:item/lod/insidious" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/insidious_3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/insidious.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/insidious_3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/insidious.png