From 0dbdc715c065996940aac1f556a0c3e084e20f43 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 21 May 2025 20:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E6=A0=87=E6=9E=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 5 +++- .../superbwarfare/models/item/javelin.json | 28 ++++++++++++++++++ .../models/item/javelin_base.json | 0 .../models/item/javelin_icon.json | 2 +- .../datagen/ModItemModelProvider.java | 1 + .../superbwarfare/models/item/javelin.json | 27 ----------------- .../javelin_3d.json => lod/javelin.json} | 4 +-- .../item/{javelin_3d.png => lod/javelin.png} | Bin 8 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/javelin.json rename src/{main => generated}/resources/assets/superbwarfare/models/item/javelin_base.json (100%) rename src/{main => generated}/resources/assets/superbwarfare/models/item/javelin_icon.json (63%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/javelin.json rename src/main/resources/assets/superbwarfare/models/{item/javelin_3d.json => lod/javelin.json} (98%) rename src/main/resources/assets/superbwarfare/textures/item/{javelin_3d.png => lod/javelin.png} (100%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index ae7ea9a5c..cb40733d2 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T21:38:29.0648576 Item Models: superbwarfare +// 1.21.1 2025-05-21T21:39:58.7875729 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 @@ -88,7 +88,10 @@ a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/hpj_11 e04bbd61e716fc5d53c9425aba508fc3287bfd57 assets/superbwarfare/models/item/iron_powder.json 00e7fd942d22c0fbf1f5b70cd5f4d86cc6f5be1d assets/superbwarfare/models/item/iron_spring.json 590c0efcf223fdc2e98660ff3b293a68f87ac02e assets/superbwarfare/models/item/iron_trigger.json +e04fdc11913515f88a8a5f5dad4c12a7daafaf9a assets/superbwarfare/models/item/javelin.json +96f57707aa46dfc28da03d427ce8c8cf2b94dcde assets/superbwarfare/models/item/javelin_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json +00908dfc5fd1cdf7f52fe550cb33d71ec46cc112 assets/superbwarfare/models/item/javelin_icon.json 195c1b7cbcce9b0ac42ecbfc21a8cafff8c78372 assets/superbwarfare/models/item/jump_pad.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json 02214d593955d899847663e54f3dbcd396da0760 assets/superbwarfare/models/item/large_battery_pack.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/javelin.json b/src/generated/resources/assets/superbwarfare/models/item/javelin.json new file mode 100644 index 000000000..884bb5085 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/javelin.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/javelin_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/javelin" + }, + "ground": { + "parent": "superbwarfare:lod/javelin" + }, + "gui": { + "parent": "superbwarfare:item/javelin_icon" + }, + "head": { + "parent": "superbwarfare:lod/javelin" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/javelin" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/javelin" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin_base.json b/src/generated/resources/assets/superbwarfare/models/item/javelin_base.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/javelin_base.json rename to src/generated/resources/assets/superbwarfare/models/item/javelin_base.json diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin_icon.json b/src/generated/resources/assets/superbwarfare/models/item/javelin_icon.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/javelin_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/javelin_icon.json index e59d06676..da6a5d9e0 100644 --- a/src/main/resources/assets/superbwarfare/models/item/javelin_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/javelin_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/javelin_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 9f725be9e..8e80c9876 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -39,6 +39,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.HOMEMADE_SHOTGUN); gunItem(ModItems.HUNTING_RIFLE); gunItem(ModItems.INSIDIOUS); + gunItem(ModItems.JAVELIN); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin.json b/src/main/resources/assets/superbwarfare/models/item/javelin.json deleted file mode 100644 index 1d4c28906..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/javelin.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/javelin_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/javelin_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/javelin_3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/javelin_3d" - }, - "ground": { - "parent": "superbwarfare:item/javelin_3d" - }, - "fixed": { - "parent": "superbwarfare:item/javelin_3d" - }, - "head": { - "parent": "superbwarfare:item/javelin_3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin_3d.json b/src/main/resources/assets/superbwarfare/models/lod/javelin.json similarity index 98% rename from src/main/resources/assets/superbwarfare/models/item/javelin_3d.json rename to src/main/resources/assets/superbwarfare/models/lod/javelin.json index b8ec581f6..c4ef42ad7 100644 --- a/src/main/resources/assets/superbwarfare/models/item/javelin_3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/javelin.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "superbwarfare:item/javelin_3d", - "particle": "superbwarfare:item/javelin_3d" + "0": "superbwarfare:item/lod/javelin", + "particle": "superbwarfare:item/lod/javelin" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/javelin_3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/javelin.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/javelin_3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/javelin.png