From 2f6392d94e3ff2dedefec3283476cd2dbe87a4f0 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 21 May 2025 22:00:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96m1911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 5 +++- .../superbwarfare/models/item/m_1911.json | 28 ++++++++++++++++++ .../models/item/m_1911_base.json | 6 ++++ .../models/item/m_1911_icon.json | 6 ++++ .../client/model/item/M1911ItemModel.java | 4 +-- .../datagen/ModItemModelProvider.java | 1 + .../item/gun/handgun/M1911Item.java | 14 ++++----- .../geo/{m1911.geo.json => m_1911.geo.json} | 2 +- .../{m1911.item.json => m_1911.item.json} | 0 .../superbwarfare/models/item/m1911_icon.json | 6 ---- .../superbwarfare/models/item/m_1911.json | 27 ----------------- .../models/item/m_1911_base.json | 6 ---- .../{item/m1911_3d.json => lod/m_1911.json} | 4 +-- .../{m1911_icon.png => m_1911_icon.png} | Bin .../item/{m1911_3d.png => lod/m_1911.png} | Bin .../textures/item/{m1911.png => m_1911.png} | Bin .../item/{m1911_icon.png => m_1911_icon.png} | Bin 17 files changed, 57 insertions(+), 52 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/m_1911.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/m_1911_base.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/m_1911_icon.json rename src/main/resources/assets/superbwarfare/geo/{m1911.geo.json => m_1911.geo.json} (99%) rename src/main/resources/assets/superbwarfare/models/displaysettings/{m1911.item.json => m_1911.item.json} (100%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/m1911_icon.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/m_1911.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/m_1911_base.json rename src/main/resources/assets/superbwarfare/models/{item/m1911_3d.json => lod/m_1911.json} (98%) rename src/main/resources/assets/superbwarfare/textures/gun_icon/{m1911_icon.png => m_1911_icon.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{m1911_3d.png => lod/m_1911.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{m1911.png => m_1911.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{m1911_icon.png => m_1911_icon.png} (100%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index fd454c2d1..ea090c8fe 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T23:19:47.6644332 Item Models: superbwarfare +// 1.21.1 2025-05-21T23:37:51.9812731 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 @@ -121,7 +121,10 @@ ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json 4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.json +9f523f08520ee193ca626e46602baddf46d2acc3 assets/superbwarfare/models/item/m_1911.json +9564d9a7a4a4f05dd6840e166d601d7fc50a29ce assets/superbwarfare/models/item/m_1911_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_1911_blueprint.json +abfc41b0ce81fa4107c892db89d2f7aef54b9cf5 assets/superbwarfare/models/item/m_1911_icon.json 6e140a5076d9eb4787c0ea14ef3dedc87825dde6 assets/superbwarfare/models/item/m_4.json 516a430e688e26c4f02bded1113b7bd8c133dcef assets/superbwarfare/models/item/m_4_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_4_blueprint.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_1911.json b/src/generated/resources/assets/superbwarfare/models/item/m_1911.json new file mode 100644 index 000000000..65953b463 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/m_1911.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/m_1911_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/m_1911" + }, + "ground": { + "parent": "superbwarfare:lod/m_1911" + }, + "gui": { + "parent": "superbwarfare:item/m_1911_icon" + }, + "head": { + "parent": "superbwarfare:lod/m_1911" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/m_1911" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/m_1911" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_1911_base.json b/src/generated/resources/assets/superbwarfare/models/item/m_1911_base.json new file mode 100644 index 000000000..de1ac079b --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/m_1911_base.json @@ -0,0 +1,6 @@ +{ + "parent": "superbwarfare:displaysettings/m_1911.item", + "textures": { + "layer0": "superbwarfare:item/m_1911" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_1911_icon.json b/src/generated/resources/assets/superbwarfare/models/item/m_1911_icon.json new file mode 100644 index 000000000..53af8ad4a --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/m_1911_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/m_1911_icon" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java index 92aa903c2..d6f39b894 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M1911ItemModel.java @@ -28,12 +28,12 @@ public class M1911ItemModel extends GeoModel { @Override public ResourceLocation getModelResource(M1911Item animatable) { - return Mod.loc("geo/m1911.geo.json"); + return Mod.loc("geo/m_1911.geo.json"); } @Override public ResourceLocation getTextureResource(M1911Item animatable) { - return Mod.loc("textures/item/m1911.png"); + return Mod.loc("textures/item/m_1911.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 5a5468f04..83c2d8d7b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -44,6 +44,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.M_4); gunItem(ModItems.M_60); gunItem(ModItems.M_79); + gunItem(ModItems.M_1911); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java index 1cbc07005..bb02c1cc3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java @@ -50,14 +50,14 @@ public class M1911Item extends GunItem implements GeoItem { if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; if (GunData.from(stack).reload.empty()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_empty")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock_17.reload_empty")); } if (GunData.from(stack).reload.normal()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock_17.reload_normal")); } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle")); } private PlayState idlePredicate(AnimationState event) { @@ -70,13 +70,13 @@ public class M1911Item extends GunItem implements GeoItem { && ClientEventHandler.cantSprint == 0 && !(GunData.from(stack).reload.normal() || GunData.from(stack).reload.empty()) && ClientEventHandler.drawTime < 0.01) { if (ClientEventHandler.tacticalSprint) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock_17.idle")); } @Override @@ -102,7 +102,7 @@ public class M1911Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return Mod.loc("textures/gun_icon/m1911_icon.png"); + return Mod.loc("textures/gun_icon/m_1911_icon.png"); } @Override diff --git a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json b/src/main/resources/assets/superbwarfare/geo/m_1911.geo.json similarity index 99% rename from src/main/resources/assets/superbwarfare/geo/m1911.geo.json rename to src/main/resources/assets/superbwarfare/geo/m_1911.geo.json index 1d9e790cc..e1f7740f7 100644 --- a/src/main/resources/assets/superbwarfare/geo/m1911.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m_1911.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.m1911", + "identifier": "geometry.m_1911", "texture_width": 64, "texture_height": 64, "visible_bounds_width": 126, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/m_1911.item.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/displaysettings/m1911.item.json rename to src/main/resources/assets/superbwarfare/models/displaysettings/m_1911.item.json diff --git a/src/main/resources/assets/superbwarfare/models/item/m1911_icon.json b/src/main/resources/assets/superbwarfare/models/item/m1911_icon.json deleted file mode 100644 index c52a8d43b..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/m1911_icon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/m1911_icon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/m_1911.json b/src/main/resources/assets/superbwarfare/models/item/m_1911.json deleted file mode 100644 index b4394e6d3..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/m_1911.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/m_1911_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/m1911_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/m1911_3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/m1911_3d" - }, - "ground": { - "parent": "superbwarfare:item/m1911_3d" - }, - "fixed": { - "parent": "superbwarfare:item/m1911_3d" - }, - "head": { - "parent": "superbwarfare:item/m1911_3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json b/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json deleted file mode 100644 index 625f7fabb..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/m_1911_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "superbwarfare:displaysettings/glock17.item", - "textures": { - "layer0": "superbwarfare:item/m1911" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/m1911_3d.json b/src/main/resources/assets/superbwarfare/models/lod/m_1911.json similarity index 98% rename from src/main/resources/assets/superbwarfare/models/item/m1911_3d.json rename to src/main/resources/assets/superbwarfare/models/lod/m_1911.json index fc412945a..c22c3adfe 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m1911_3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/m_1911.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "superbwarfare:item/m1911_3d", - "particle": "superbwarfare:item/m1911_3d" + "0": "superbwarfare:item/lod/m_1911", + "particle": "superbwarfare:item/lod/m_1911" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/m1911_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/m_1911_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/gun_icon/m1911_icon.png rename to src/main/resources/assets/superbwarfare/textures/gun_icon/m_1911_icon.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/m1911_3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/m_1911.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/m1911_3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/m_1911.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/m1911.png b/src/main/resources/assets/superbwarfare/textures/item/m_1911.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/m1911.png rename to src/main/resources/assets/superbwarfare/textures/item/m_1911.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/m1911_icon.png b/src/main/resources/assets/superbwarfare/textures/item/m_1911_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/m1911_icon.png rename to src/main/resources/assets/superbwarfare/textures/item/m_1911_icon.png