From 0a497e8ec3c54b46ea038aa94ef7b0775e92eb24 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Thu, 22 May 2025 02:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96vector?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/models/item/vector.json | 28 ++++++++++++++++++ .../models/item/vector_base.json | 0 .../models/item/vector_icon.json | 2 +- .../datagen/ModItemModelProvider.java | 1 + .../item/gun/smg/VectorItem.java | 16 +++++----- .../animations/vector.animation.json | 14 ++++----- .../superbwarfare/models/item/vector.json | 27 ----------------- .../{item/vector3d.json => lod/vector.json} | 4 +-- .../item/{vector3d.png => lod/vector.png} | Bin 9 files changed, 47 insertions(+), 45 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/vector.json rename src/{main => generated}/resources/assets/superbwarfare/models/item/vector_base.json (100%) rename src/{main => generated}/resources/assets/superbwarfare/models/item/vector_icon.json (63%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/vector.json rename src/main/resources/assets/superbwarfare/models/{item/vector3d.json => lod/vector.json} (99%) rename src/main/resources/assets/superbwarfare/textures/item/{vector3d.png => lod/vector.png} (100%) diff --git a/src/generated/resources/assets/superbwarfare/models/item/vector.json b/src/generated/resources/assets/superbwarfare/models/item/vector.json new file mode 100644 index 000000000..2c7d5ad59 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/vector.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/vector_base" + }, + "gui_light": "front", + "loader": "forge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/vector" + }, + "ground": { + "parent": "superbwarfare:lod/vector" + }, + "gui": { + "parent": "superbwarfare:item/vector_icon" + }, + "head": { + "parent": "superbwarfare:lod/vector" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/vector" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/vector" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/vector_base.json b/src/generated/resources/assets/superbwarfare/models/item/vector_base.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/vector_base.json rename to src/generated/resources/assets/superbwarfare/models/item/vector_base.json diff --git a/src/main/resources/assets/superbwarfare/models/item/vector_icon.json b/src/generated/resources/assets/superbwarfare/models/item/vector_icon.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/vector_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/vector_icon.json index 9e3f7f57e..7e75a3403 100644 --- a/src/main/resources/assets/superbwarfare/models/item/vector_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/vector_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/vector_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index f033c0518..f11e0e9f4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -62,6 +62,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.SVD); gunItem(ModItems.TASER); gunItem(ModItems.TRACHELIUM); + gunItem(ModItems.VECTOR); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java index 667982387..a647d0564 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java @@ -47,29 +47,29 @@ public class VectorItem extends GunItem implements GeoItem { if (data.reload.empty()) { if (drum) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_empty_drum")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vector.reload_empty_drum")); } else { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_empty")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vector.reload_empty")); } } if (data.reload.normal()) { if (drum) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_normal_drum")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vector.reload_normal_drum")); } else { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload_normal")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vector.reload_normal")); } } if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) { if (ClientEventHandler.tacticalSprint) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run_fast")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vector.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vector.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vector.idle")); } private PlayState editPredicate(AnimationState event) { @@ -82,7 +82,7 @@ public class VectorItem extends GunItem implements GeoItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vector.edit")); } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vector.idle")); } @Override diff --git a/src/main/resources/assets/superbwarfare/animations/vector.animation.json b/src/main/resources/assets/superbwarfare/animations/vector.animation.json index 50c708752..74773df28 100644 --- a/src/main/resources/assets/superbwarfare/animations/vector.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/vector.animation.json @@ -1,7 +1,7 @@ { "format_version": "1.8.0", "animations": { - "animation.vec.idle": { + "animation.vector.idle": { "animation_length": 1 }, "animation.vector.edit": { @@ -38,7 +38,7 @@ } } }, - "animation.vec.run": { + "animation.vector.run": { "loop": true, "animation_length": 0.8, "bones": { @@ -99,7 +99,7 @@ } } }, - "animation.vec.run_fast": { + "animation.vector.run_fast": { "loop": true, "animation_length": 0.7, "bones": { @@ -164,7 +164,7 @@ } } }, - "animation.vec.reload_empty": { + "animation.vector.reload_empty": { "loop": "hold_on_last_frame", "animation_length": 3.25, "override_previous_animation": true, @@ -489,7 +489,7 @@ } } }, - "animation.vec.reload_normal": { + "animation.vector.reload_normal": { "loop": "hold_on_last_frame", "animation_length": 2.5, "override_previous_animation": true, @@ -728,7 +728,7 @@ } } }, - "animation.vec.reload_empty_drum": { + "animation.vector.reload_empty_drum": { "loop": "hold_on_last_frame", "animation_length": 3.25, "override_previous_animation": true, @@ -1059,7 +1059,7 @@ } } }, - "animation.vec.reload_normal_drum": { + "animation.vector.reload_normal_drum": { "loop": "hold_on_last_frame", "animation_length": 2.875, "override_previous_animation": true, diff --git a/src/main/resources/assets/superbwarfare/models/item/vector.json b/src/main/resources/assets/superbwarfare/models/item/vector.json deleted file mode 100644 index bff82e7cd..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/vector.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/vector_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/vector_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/vector3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/vector3d" - }, - "ground": { - "parent": "superbwarfare:item/vector3d" - }, - "fixed": { - "parent": "superbwarfare:item/vector3d" - }, - "head": { - "parent": "superbwarfare:item/vector3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/vector3d.json b/src/main/resources/assets/superbwarfare/models/lod/vector.json similarity index 99% rename from src/main/resources/assets/superbwarfare/models/item/vector3d.json rename to src/main/resources/assets/superbwarfare/models/lod/vector.json index e2f74259b..eba980d1e 100644 --- a/src/main/resources/assets/superbwarfare/models/item/vector3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/vector.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "superbwarfare:item/vector3d", - "particle": "superbwarfare:item/vector3d" + "0": "superbwarfare:item/lod/vector", + "particle": "superbwarfare:item/lod/vector" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/vector3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/vector.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/vector3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/vector.png