From 5530cf77e143348b9ef9773e2cd14aa5fbf63df0 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 21 May 2025 21:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96kar=2098k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 5 +++- .../superbwarfare/models/item/k_98.json | 28 ++++++++++++++++++ .../superbwarfare/models/item/k_98_base.json | 6 ++++ .../superbwarfare/models/item/k_98_icon.json | 6 ++++ .../client/model/item/K98ItemModel.java | 6 ++-- .../datagen/ModItemModelProvider.java | 1 + .../item/gun/sniper/K98Item.java | 22 +++++++------- ...k98.animation.json => k_98.animation.json} | 26 ++++++++-------- .../geo/{kar98k.geo.json => k_98.geo.json} | 2 +- .../{k98.item.json => k_98.item.json} | 0 .../superbwarfare/models/item/k98_base.json | 6 ---- .../superbwarfare/models/item/k98_icon.json | 6 ---- .../superbwarfare/models/item/k_98.json | 27 ----------------- .../{item/k98_3d.json => lod/k_98.json} | 4 +-- .../gun_icon/{k98_icon.png => k_98_icon.png} | Bin .../textures/item/{k98.png => k_98.png} | Bin .../item/{k98_icon.png => k_98_icon.png} | Bin .../superbwarfare/textures/item/lod/k_98.png | Bin 0 -> 418 bytes 18 files changed, 75 insertions(+), 70 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/k_98.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/k_98_base.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/k_98_icon.json rename src/main/resources/assets/superbwarfare/animations/{k98.animation.json => k_98.animation.json} (99%) rename src/main/resources/assets/superbwarfare/geo/{kar98k.geo.json => k_98.geo.json} (99%) rename src/main/resources/assets/superbwarfare/models/displaysettings/{k98.item.json => k_98.item.json} (100%) delete mode 100644 src/main/resources/assets/superbwarfare/models/item/k98_base.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/k98_icon.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/k_98.json rename src/main/resources/assets/superbwarfare/models/{item/k98_3d.json => lod/k_98.json} (98%) rename src/main/resources/assets/superbwarfare/textures/gun_icon/{k98_icon.png => k_98_icon.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{k98.png => k_98.png} (100%) rename src/main/resources/assets/superbwarfare/textures/item/{k98_icon.png => k_98_icon.png} (100%) create mode 100644 src/main/resources/assets/superbwarfare/textures/item/lod/k_98.png diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index cb40733d2..5a2d6d3bc 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T21:39:58.7875729 Item Models: superbwarfare +// 1.21.1 2025-05-21T21:43:37.7471932 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 @@ -93,7 +93,10 @@ e04fdc11913515f88a8a5f5dad4c12a7daafaf9a assets/superbwarfare/models/item/javeli 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json 00908dfc5fd1cdf7f52fe550cb33d71ec46cc112 assets/superbwarfare/models/item/javelin_icon.json 195c1b7cbcce9b0ac42ecbfc21a8cafff8c78372 assets/superbwarfare/models/item/jump_pad.json +929fbb16bdbb6d44b0d77b6dd17b41ebb6d7047e assets/superbwarfare/models/item/k_98.json +89b09e3941be6ac188a2882f76cbed1900ed9c88 assets/superbwarfare/models/item/k_98_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json +cca79a16a674a247d5a786253407ada56c95fc78 assets/superbwarfare/models/item/k_98_icon.json 02214d593955d899847663e54f3dbcd396da0760 assets/superbwarfare/models/item/large_battery_pack.json 4c9b6c2911ae5e6e2a026d2ae9d3c0564cdba0b3 assets/superbwarfare/models/item/large_motor.json 95c0f92c4a4b3adff9c95878540071b04a921792 assets/superbwarfare/models/item/large_propeller.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/k_98.json b/src/generated/resources/assets/superbwarfare/models/item/k_98.json new file mode 100644 index 000000000..60bf43ec2 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/k_98.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/k_98_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/k_98" + }, + "ground": { + "parent": "superbwarfare:lod/k_98" + }, + "gui": { + "parent": "superbwarfare:item/k_98_icon" + }, + "head": { + "parent": "superbwarfare:lod/k_98" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/k_98" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/k_98" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/k_98_base.json b/src/generated/resources/assets/superbwarfare/models/item/k_98_base.json new file mode 100644 index 000000000..40e15b653 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/k_98_base.json @@ -0,0 +1,6 @@ +{ + "parent": "superbwarfare:displaysettings/k_98.item", + "textures": { + "layer0": "superbwarfare:item/k_98" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/k_98_icon.json b/src/generated/resources/assets/superbwarfare/models/item/k_98_icon.json new file mode 100644 index 000000000..891f37231 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/k_98_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/k_98_icon" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java index ccc2d10b4..939b2b37e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java @@ -19,17 +19,17 @@ public class K98ItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(K98Item animatable) { - return Mod.loc("animations/k98.animation.json"); + return Mod.loc("animations/k_98.animation.json"); } @Override public ResourceLocation getModelResource(K98Item animatable) { - return Mod.loc("geo/kar98k.geo.json"); + return Mod.loc("geo/k_98.geo.json"); } @Override public ResourceLocation getTextureResource(K98Item animatable) { - return Mod.loc("textures/item/k98.png"); + return Mod.loc("textures/item/k_98.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 8e80c9876..ec6932152 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -40,6 +40,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.HUNTING_RIFLE); gunItem(ModItems.INSIDIOUS); gunItem(ModItems.JAVELIN); + gunItem(ModItems.K_98); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java index 20366bc70..ad9d2d54d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java @@ -44,30 +44,30 @@ public class K98Item extends GunItem implements GeoItem { var data = GunData.from(stack); if (data.bolt.actionTimer.get() > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.shift")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.shift")); } if (data.reload.empty()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.reload_empty")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.reload_empty")); } if (data.reload.stage() == 1 && data.reload.prepareTimer.get() > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.prepare")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.prepare")); } if (data.loadIndex.get() == 0 && data.reload.stage() == 2) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.iterativeload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.iterativeload")); } if (data.loadIndex.get() == 1 && data.reload.stage() == 2) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.iterativeload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.iterativeload2")); } if (data.reload.stage() == 3) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k98.finish")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.k_98.finish")); } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.idle")); } private PlayState idlePredicate(AnimationState event) { @@ -88,13 +88,13 @@ public class K98Item extends GunItem implements GeoItem { && !data.reloading() ) { if (ClientEventHandler.tacticalSprint && data.bolt.actionTimer.get() == 0) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run_fast")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k_98.idle")); } @Override @@ -123,7 +123,7 @@ public class K98Item extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return Mod.loc("textures/gun_icon/k98_icon.png"); + return Mod.loc("textures/gun_icon/k_98_icon.png"); } @Override diff --git a/src/main/resources/assets/superbwarfare/animations/k98.animation.json b/src/main/resources/assets/superbwarfare/animations/k_98.animation.json similarity index 99% rename from src/main/resources/assets/superbwarfare/animations/k98.animation.json rename to src/main/resources/assets/superbwarfare/animations/k_98.animation.json index ec708bac2..f001d8c58 100644 --- a/src/main/resources/assets/superbwarfare/animations/k98.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/k_98.animation.json @@ -1,10 +1,10 @@ { "format_version": "1.8.0", "animations": { - "animation.k98.idle": { + "animation.k_98.idle": { "animation_length": 1 }, - "animation.k98.draw": { + "animation.k_98.draw": { "animation_length": 1, "bones": { "0": { @@ -42,7 +42,7 @@ } } }, - "animation.k98.run": { + "animation.k_98.run": { "loop": true, "animation_length": 0.8, "bones": { @@ -117,7 +117,7 @@ } } }, - "animation.k98.run_fast": { + "animation.k_98.run_fast": { "loop": true, "animation_length": 0.7, "bones": { @@ -207,7 +207,7 @@ } } }, - "animation.k98.fire": { + "animation.k_98.fire": { "loop": "hold_on_last_frame", "animation_length": 0.202, "bones": { @@ -224,7 +224,7 @@ } } }, - "animation.k98.shift": { + "animation.k_98.shift": { "loop": "hold_on_last_frame", "animation_length": 1.1, "override_previous_animation": true, @@ -566,7 +566,7 @@ } } }, - "animation.k98.reload_empty": { + "animation.k_98.reload_empty": { "loop": "hold_on_last_frame", "animation_length": 3, "override_previous_animation": true, @@ -1216,7 +1216,7 @@ } } }, - "animation.k98.prepare": { + "animation.k_98.prepare": { "loop": "hold_on_last_frame", "animation_length": 2, "override_previous_animation": true, @@ -1600,7 +1600,7 @@ } } }, - "animation.k98.iterativeload": { + "animation.k_98.iterativeload": { "loop": true, "animation_length": 0.75, "override_previous_animation": true, @@ -1832,11 +1832,11 @@ }, "sound_effects": { "0.0": { - "effect": "k98_loop" + "effect": "k_98_loop" } } }, - "animation.k98.iterativeload2": { + "animation.k_98.iterativeload2": { "loop": true, "animation_length": 0.75, "override_previous_animation": true, @@ -2068,11 +2068,11 @@ }, "sound_effects": { "0.0": { - "effect": "k98_loop" + "effect": "k_98_loop" } } }, - "animation.k98.finish": { + "animation.k_98.finish": { "loop": "hold_on_last_frame", "animation_length": 1.25, "override_previous_animation": true, diff --git a/src/main/resources/assets/superbwarfare/geo/kar98k.geo.json b/src/main/resources/assets/superbwarfare/geo/k_98.geo.json similarity index 99% rename from src/main/resources/assets/superbwarfare/geo/kar98k.geo.json rename to src/main/resources/assets/superbwarfare/geo/k_98.geo.json index 7a0a47819..e9b04d5f1 100644 --- a/src/main/resources/assets/superbwarfare/geo/kar98k.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/k_98.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.unknown", + "identifier": "geometry.k_98", "texture_width": 64, "texture_height": 64, "visible_bounds_width": 4, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/k98.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/displaysettings/k98.item.json rename to src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json diff --git a/src/main/resources/assets/superbwarfare/models/item/k98_base.json b/src/main/resources/assets/superbwarfare/models/item/k98_base.json deleted file mode 100644 index b190f595d..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/k98_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "superbwarfare:displaysettings/k98.item", - "textures": { - "layer0": "superbwarfare:item/k98" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/k98_icon.json b/src/main/resources/assets/superbwarfare/models/item/k98_icon.json deleted file mode 100644 index acdb2840d..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/k98_icon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/k98_icon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/k_98.json b/src/main/resources/assets/superbwarfare/models/item/k_98.json deleted file mode 100644 index 5cbc0fe11..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/k_98.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/k98_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/k98_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/k98_3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/k98_3d" - }, - "ground": { - "parent": "superbwarfare:item/k98_3d" - }, - "fixed": { - "parent": "superbwarfare:item/k98_3d" - }, - "head": { - "parent": "superbwarfare:item/k98_3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/k98_3d.json b/src/main/resources/assets/superbwarfare/models/lod/k_98.json similarity index 98% rename from src/main/resources/assets/superbwarfare/models/item/k98_3d.json rename to src/main/resources/assets/superbwarfare/models/lod/k_98.json index 021a94633..9a4751169 100644 --- a/src/main/resources/assets/superbwarfare/models/item/k98_3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/k_98.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "superbwarfare:item/hunting_rifle3d", - "particle": "superbwarfare:item/hunting_rifle3d" + "0": "superbwarfare:item/lod/k_98", + "particle": "superbwarfare:item/lod/k_98" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/k98_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/k_98_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/gun_icon/k98_icon.png rename to src/main/resources/assets/superbwarfare/textures/gun_icon/k_98_icon.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/k98.png b/src/main/resources/assets/superbwarfare/textures/item/k_98.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/k98.png rename to src/main/resources/assets/superbwarfare/textures/item/k_98.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/k98_icon.png b/src/main/resources/assets/superbwarfare/textures/item/k_98_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/k98_icon.png rename to src/main/resources/assets/superbwarfare/textures/item/k_98_icon.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/lod/k_98.png b/src/main/resources/assets/superbwarfare/textures/item/lod/k_98.png new file mode 100644 index 0000000000000000000000000000000000000000..ccbf335ed1afbe43821355c3a44612256a5fcc2a GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fM%aSW-L^Y+HZtV0eG>>vJn z9zQ3`UE83vouigfwl%9G_~6}xXZdOy^Z4#^`%R4~uVq~5{UXGC;bMKkuo-tyS(~KwYH3y?4gz2 zo8-Q1z01U~uJ`rcf`HrK*cnpSF}}VVw`PV#pEm#L-=+%XTwC(jc}XrfXU%Yfk*9$% zBENa_S@pPOm*4zW>SAE{tMH@r{_#Is&-|M6c^~r{<{v-5eeOB-c+uC8bHDjE#4(@Q z{=48hOONIJIPa~86gR|(uD_)Cn&FIQK~{IH-16WDB2J&`csKAR2)f?9SMPU&ahv(K z<_9n0@5f);UHjI*`2b&m#DU9?k6c~s{j`>S#rL1lWokFL*}byo9(Yu9&c=Jq@00ze vYfC4!Jz##noPl|Qo`V!7(a?bmvQqO literal 0 HcmV?d00001