From 27e3be68980311a19178db85b4b4c898d662171f Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Thu, 22 May 2025 01:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=81=BE=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/item/secondary_cataclysm.json | 28 ++++++++++++++++++ .../models/item/secondary_cataclysm_base.json | 0 .../models/item/secondary_cataclysm_icon.json | 2 +- .../datagen/ModItemModelProvider.java | 1 + .../item/gun/launcher/SecondaryCataclysm.java | 18 +++++------ .../secondary_cataclysm.animation.json | 16 +++++----- .../models/item/secondary_cataclysm.json | 27 ----------------- .../secondary_cataclysm.json} | 2 +- .../secondary_cataclysm.png} | Bin 9 files changed, 48 insertions(+), 46 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm.json rename src/{main => generated}/resources/assets/superbwarfare/models/item/secondary_cataclysm_base.json (100%) rename src/{main => generated}/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json (67%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json rename src/main/resources/assets/superbwarfare/models/{item/secondary_cataclysm_3d.json => lod/secondary_cataclysm.json} (99%) rename src/main/resources/assets/superbwarfare/textures/item/{secondary_cataclysm_3d.png => lod/secondary_cataclysm.png} (100%) diff --git a/src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm.json b/src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm.json new file mode 100644 index 000000000..bb9a09aa9 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/secondary_cataclysm_base" + }, + "gui_light": "front", + "loader": "forge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/secondary_cataclysm" + }, + "ground": { + "parent": "superbwarfare:lod/secondary_cataclysm" + }, + "gui": { + "parent": "superbwarfare:item/secondary_cataclysm_icon" + }, + "head": { + "parent": "superbwarfare:lod/secondary_cataclysm" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/secondary_cataclysm" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/secondary_cataclysm" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_base.json b/src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm_base.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_base.json rename to src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm_base.json diff --git a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json b/src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json similarity index 67% rename from src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json index c6f321f41..07dee9f5e 100644 --- a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/secondary_cataclysm_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/secondary_cataclysm_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index b98a7298f..0fd60ebea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -56,6 +56,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.QBZ_95); gunItem(ModItems.RPG); gunItem(ModItems.RPK); + gunItem(ModItems.SECONDARY_CATACLYSM); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index 5d9ea24fe..5d1a1dcf9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -79,26 +79,26 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag var data = GunData.from(stack); if (data.reload.stage() == 1 && data.reload.prepareLoadTimer.get() > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.prepare")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.prepare")); } if (data.loadIndex.get() == 0 && data.reload.stage() == 2) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.iterativeload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.iterativeload")); } if (data.loadIndex.get() == 1 && data.reload.stage() == 2) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.iterativeload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.iterativeload2")); } if (ClientEventHandler.gunMelee > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.hit")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.hit")); } if (data.reload.stage() == 3) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.finish")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.secondary_cataclysm.finish")); } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.idle")); } private PlayState idlePredicate(AnimationState event) { @@ -119,13 +119,13 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag && !data.reloading() ) { if (ClientEventHandler.tacticalSprint) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.run_fast")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.secondary_cataclysm.idle")); } @Override diff --git a/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json b/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json index ddcce178b..ef2602ef4 100644 --- a/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json @@ -1,10 +1,10 @@ { "format_version": "1.8.0", "animations": { - "animation.sc.idle": { + "animation.secondary_cataclysm.idle": { "loop": true }, - "animation.sc.run": { + "animation.secondary_cataclysm.run": { "loop": true, "animation_length": 0.8, "bones": { @@ -56,7 +56,7 @@ } } }, - "animation.sc.run_fast": { + "animation.secondary_cataclysm.run_fast": { "loop": true, "animation_length": 0.8, "bones": { @@ -117,7 +117,7 @@ } } }, - "animation.sc.prepare": { + "animation.secondary_cataclysm.prepare": { "loop": "hold_on_last_frame", "animation_length": 1.6, "bones": { @@ -410,7 +410,7 @@ } } }, - "animation.sc.iterativeload": { + "animation.secondary_cataclysm.iterativeload": { "loop": true, "animation_length": 1, "bones": { @@ -642,7 +642,7 @@ } } }, - "animation.sc.iterativeload2": { + "animation.secondary_cataclysm.iterativeload2": { "loop": true, "animation_length": 1, "bones": { @@ -874,7 +874,7 @@ } } }, - "animation.sc.finish": { + "animation.secondary_cataclysm.finish": { "loop": "hold_on_last_frame", "animation_length": 1, "bones": { @@ -1040,7 +1040,7 @@ } } }, - "animation.sc.hit": { + "animation.secondary_cataclysm.hit": { "animation_length": 1, "bones": { "0": { diff --git a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json b/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json deleted file mode 100644 index d696ca8d7..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/secondary_cataclysm_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/secondary_cataclysm_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/secondary_cataclysm_3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/secondary_cataclysm_3d" - }, - "ground": { - "parent": "superbwarfare:item/secondary_cataclysm_3d" - }, - "fixed": { - "parent": "superbwarfare:item/secondary_cataclysm_3d" - }, - "head": { - "parent": "superbwarfare:item/secondary_cataclysm_3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_3d.json b/src/main/resources/assets/superbwarfare/models/lod/secondary_cataclysm.json similarity index 99% rename from src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_3d.json rename to src/main/resources/assets/superbwarfare/models/lod/secondary_cataclysm.json index e271aaf22..be89d4007 100644 --- a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm_3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/secondary_cataclysm.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "texture_size": [128, 128], "textures": { - "1": "superbwarfare:item/secondary_cataclysm_3d" + "1": "superbwarfare:item/lod/secondary_cataclysm" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_3d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/secondary_cataclysm.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_3d.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/secondary_cataclysm.png