diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index e45c89ce8..6bbc1b832 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T23:39:01.6719818 Item Models: superbwarfare +// 1.21.1 2025-05-21T23:41:38.5170675 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 @@ -141,7 +141,10 @@ a16e65b4895406036d6348e601f1520f994b3795 assets/superbwarfare/models/item/m_79_i c5161c419b3b090c08e65010825e18c0fbb5d343 assets/superbwarfare/models/item/m_870_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_870_blueprint.json c9c299481da1b79f3413b876d60f1bad7d891122 assets/superbwarfare/models/item/m_870_icon.json +54823752b1ed509dabb67e09e03b5da310c453b9 assets/superbwarfare/models/item/m_98b.json +6d36406c48dc611580852cf4438d94d016748eee assets/superbwarfare/models/item/m_98b_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_98b_blueprint.json +19c780460988545b909fca9c6acd999c7c59797c assets/superbwarfare/models/item/m_98b_icon.json 26848edc4a8e0971321c5fccb47dd7d0e89a9f18 assets/superbwarfare/models/item/netherite_action.json f5b4fc1445373e6acfaa077e109de693c624eb1e assets/superbwarfare/models/item/netherite_barrel.json 501149685600161de8708a8199aab644d8ecee8b assets/superbwarfare/models/item/netherite_spring.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_98b.json b/src/generated/resources/assets/superbwarfare/models/item/m_98b.json new file mode 100644 index 000000000..46ce7186d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/m_98b.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/m_98b_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/m_98b" + }, + "ground": { + "parent": "superbwarfare:lod/m_98b" + }, + "gui": { + "parent": "superbwarfare:item/m_98b_icon" + }, + "head": { + "parent": "superbwarfare:lod/m_98b" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/m_98b" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/m_98b" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_98b_base.json b/src/generated/resources/assets/superbwarfare/models/item/m_98b_base.json new file mode 100644 index 000000000..9f35d801d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/m_98b_base.json @@ -0,0 +1,6 @@ +{ + "parent": "superbwarfare:displaysettings/m_98b.item", + "textures": { + "layer0": "superbwarfare:item/m_98b" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/m_98b_icon.json b/src/generated/resources/assets/superbwarfare/models/item/m_98b_icon.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/m_98b_icon.json rename to src/generated/resources/assets/superbwarfare/models/item/m_98b_icon.json index 5d73f5810..186de1024 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_98b_icon.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_98b_icon.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/m_98b_icon" } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java index 7166efea5..9a4b0ae23 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M98bItemModel.java @@ -19,17 +19,17 @@ public class M98bItemModel extends GeoModel { @Override public ResourceLocation getAnimationResource(M98bItem animatable) { - return Mod.loc("animations/m98b.animation.json"); + return Mod.loc("animations/m_98b.animation.json"); } @Override public ResourceLocation getModelResource(M98bItem animatable) { - return Mod.loc("geo/m98b.geo.json"); + return Mod.loc("geo/m_98b.geo.json"); } @Override public ResourceLocation getTextureResource(M98bItem animatable) { - return Mod.loc("textures/item/m98b.png"); + return Mod.loc("textures/item/m_98b.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 337434471..03a1c68bb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -46,6 +46,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.M_79); gunItem(ModItems.M_1911); gunItem(ModItems.M_870); + gunItem(ModItems.M_98B); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java index f4fd89096..d7bb300b7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java @@ -43,18 +43,18 @@ public class M98bItem extends GunItem implements GeoItem { var data = GunData.from(stack); if (data.bolt.actionTimer.get() > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.shift")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_98b.shift")); } if (data.reload.empty()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload_empty")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_98b.reload_empty")); } if (data.reload.normal()) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload_normal")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_98b.reload_normal")); } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_98b.idle")); } private PlayState idlePredicate(AnimationState event) { @@ -66,15 +66,15 @@ public class M98bItem extends GunItem implements GeoItem { if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 - && !(data.reload.normal() || data.reload.empty()) && ClientEventHandler.drawTime < 0.01) { - if (ClientEventHandler.tacticalSprint && data.bolt.actionTimer.get() == 0) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run_fast")); + && !(data.reload.normal() || GunData.from(stack).reload.empty()) && ClientEventHandler.drawTime < 0.01) { + if (ClientEventHandler.tacticalSprint && GunData.from(stack).bolt.actionTimer.get() == 0) { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_98b.run_fast")); } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_98b.run")); } } - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.idle")); + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_98b.idle")); } @Override @@ -97,7 +97,7 @@ public class M98bItem extends GunItem implements GeoItem { @Override public ResourceLocation getGunIcon() { - return Mod.loc("textures/gun_icon/m98b_icon.png"); + return Mod.loc("textures/gun_icon/m_98b_icon.png"); } @Override diff --git a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json b/src/main/resources/assets/superbwarfare/animations/m_98b.animation.json similarity index 99% rename from src/main/resources/assets/superbwarfare/animations/m98b.animation.json rename to src/main/resources/assets/superbwarfare/animations/m_98b.animation.json index 72f2c29bc..20f65c5b8 100644 --- a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m_98b.animation.json @@ -1,11 +1,11 @@ { "format_version": "1.8.0", "animations": { - "animation.m98b.idle": { + "animation.m_98b.idle": { "loop": true, "animation_length": 1 }, - "animation.m98b.fire": { + "animation.m_98b.fire": { "animation_length": 0.1, "bones": { "0": { @@ -15,7 +15,7 @@ } } }, - "animation.m98b.run": { + "animation.m_98b.run": { "loop": true, "animation_length": 0.8, "bones": { @@ -86,7 +86,7 @@ } } }, - "animation.m98b.run_fast": { + "animation.m_98b.run_fast": { "loop": true, "animation_length": 0.7, "bones": { @@ -155,7 +155,7 @@ } } }, - "animation.m98b.shift": { + "animation.m_98b.shift": { "loop": "hold_on_last_frame", "animation_length": 1.1, "override_previous_animation": true, @@ -501,7 +501,7 @@ } } }, - "animation.m98b.reload_empty": { + "animation.m_98b.reload_empty": { "loop": "hold_on_last_frame", "animation_length": 4.475, "override_previous_animation": true, @@ -1254,7 +1254,7 @@ } } }, - "animation.m98b.reload_normal": { + "animation.m_98b.reload_normal": { "loop": "hold_on_last_frame", "animation_length": 3.3, "override_previous_animation": true, diff --git a/src/main/resources/assets/superbwarfare/geo/m98b.geo.json b/src/main/resources/assets/superbwarfare/geo/m_98b.geo.json similarity index 99% rename from src/main/resources/assets/superbwarfare/geo/m98b.geo.json rename to src/main/resources/assets/superbwarfare/geo/m_98b.geo.json index ac042c1c8..c30abc2b7 100644 --- a/src/main/resources/assets/superbwarfare/geo/m98b.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/m_98b.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.m98b", + "identifier": "geometry.m_98b", "texture_width": 128, "texture_height": 128, "visible_bounds_width": 121, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/m98b.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/m_98b.item.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/displaysettings/m98b.item.json rename to src/main/resources/assets/superbwarfare/models/displaysettings/m_98b.item.json diff --git a/src/main/resources/assets/superbwarfare/models/item/m_98b.json b/src/main/resources/assets/superbwarfare/models/item/m_98b.json deleted file mode 100644 index 7ebda80ff..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/m_98b.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/m_98b_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/m_98b_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/m_98b3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/m_98b3d" - }, - "ground": { - "parent": "superbwarfare:item/m_98b3d" - }, - "fixed": { - "parent": "superbwarfare:item/m_98b3d" - }, - "head": { - "parent": "superbwarfare:item/m_98b3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/m_98b3d.json b/src/main/resources/assets/superbwarfare/models/item/m_98b3d.json deleted file mode 100644 index 757bccc57..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/m_98b3d.json +++ /dev/null @@ -1,378 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/ak473d", - "particle": "superbwarfare:item/ak473d" - }, - "elements": [ - { - "from": [7.5, 2, 1.25], - "to": [8.5, 3.5, 17.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, -0.75, 23.1], - "to": [8.5, 3.5, 24.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.1]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 3.2, 17.5], - "to": [8.5, 3.5, 23.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 2.4, 17.5], - "to": [8.5, 2.7, 23.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 1.7, 16.75], - "to": [8.5, 2, 19.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, -1.17886, 20.36673], - "to": [8.5, 2.42114, 20.66673], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 0.62114, 20.51673]}, - "faces": { - "north": {"uv": [6.5, 5, 6, 9], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "rotation": 270, "texture": "#0"}, - "south": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [2.5, 9.5, 3, 10.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [9.5, 3, 10, 4], "texture": "#0"} - } - }, - { - "from": [7.5, -0.75772, 21.68345], - "to": [8.5, -0.45772, 23.13345], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -0.60772, 23.48345]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 0.49228, 20.48345], - "to": [8.5, 0.79228, 23.13345], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -0.60772, 23.48345]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 0.79228, 20.28345], - "to": [8.5, 3.29228, 20.93345], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -0.60772, 23.48345]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.7, 3.59228, 17.28345], - "to": [8.3, 3.84228, 22.18345], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -0.60772, 23.48345]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.27626, 3.41676, 17.28345], - "to": [7.87626, 3.66676, 22.18345], - "rotation": {"angle": 45, "axis": "z", "origin": [7.57626, 3.54176, 19.73345]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.27574, 2.81802, 17.28345], - "to": [7.52574, 3.41802, 22.18345], - "rotation": {"angle": 0, "axis": "z", "origin": [7.40074, 3.11802, 19.73345]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "rotation": 90, "texture": "#0"}, - "east": {"uv": [6.5, 5, 6, 9], "rotation": 270, "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "rotation": 270, "texture": "#0"}, - "west": {"uv": [4, 8, 3.5, 4], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 2, 4, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 3, 4, 4], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [8.47426, 2.81802, 17.28345], - "to": [8.72426, 3.41802, 22.18345], - "rotation": {"angle": 0, "axis": "z", "origin": [8.59926, 3.11802, 19.73345]}, - "faces": { - "north": {"uv": [2.5, 10.5, 3, 9.5], "rotation": 90, "texture": "#0"}, - "east": {"uv": [4, 4, 3.5, 8], "rotation": 270, "texture": "#0"}, - "south": {"uv": [9.5, 4, 10, 3], "rotation": 270, "texture": "#0"}, - "west": {"uv": [6.5, 9, 6, 5], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 3, 4, 2], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 4, 4, 3], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [8.12374, 3.41676, 17.28345], - "to": [8.72374, 3.66676, 22.18345], - "rotation": {"angle": -45, "axis": "z", "origin": [8.42374, 3.54176, 19.73345]}, - "faces": { - "north": {"uv": [3, 9.5, 2.5, 10.5], "texture": "#0"}, - "east": {"uv": [4, 3, 0, 4], "texture": "#0"}, - "south": {"uv": [10, 3, 9.5, 4], "texture": "#0"}, - "west": {"uv": [4, 2, 0, 3], "texture": "#0"}, - "up": {"uv": [3.5, 8, 4, 4], "texture": "#0"}, - "down": {"uv": [6, 5, 6.5, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 1.15, 7.45], - "to": [8.5, 2, 13.85], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, -1.98039, 11.18355], - "to": [8.5, 1.31961, 12.48355], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 4.31961, 12.23355]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.7, 3.5, 1.25], - "to": [8.3, 3.7, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.7, 3.7, 7.25], - "to": [8.3, 4, 7.9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.7, 3.7, 10], - "to": [8.3, 4, 10.65], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.6, 4, 4], - "to": [8.4, 4.75, 13.65], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 3.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.7, -0.65, 7.7], - "to": [8.3, 2.75, 10.7], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.25, 8.75]}, - "faces": { - "north": {"uv": [5, 9.5, 5.5, 10.5], "texture": "#0"}, - "east": {"uv": [4.5, 6.5, 6, 7.5], "texture": "#0"}, - "south": {"uv": [5.5, 9.5, 6, 10.5], "texture": "#0"}, - "west": {"uv": [6.5, 6, 8, 7], "texture": "#0"}, - "up": {"uv": [0.5, 10, 0, 8.5], "texture": "#0"}, - "down": {"uv": [1, 8.5, 0.5, 10], "texture": "#0"} - } - }, - { - "from": [7.75, 0.36924, 11.24672], - "to": [8.25, 0.46924, 12.74672], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.36924, 14.24672]}, - "faces": { - "north": {"uv": [10.5, 0, 11, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10.5, 0.5, 11, 1], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10.5, 6.5], "texture": "#0"}, - "up": {"uv": [10, 8, 9.5, 7], "texture": "#0"}, - "down": {"uv": [8, 9.5, 7.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.75, 0.36924, 10.89672], - "to": [8.25, 1.21924, 11.24672], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -0.23076, 14.74672]}, - "faces": { - "north": {"uv": [10.5, 1, 11, 1.5], "texture": "#0"}, - "east": {"uv": [10.5, 1.5, 11, 2], "texture": "#0"}, - "south": {"uv": [2, 10.5, 2.5, 11], "texture": "#0"}, - "west": {"uv": [10.5, 2, 11, 2.5], "texture": "#0"}, - "up": {"uv": [3, 11, 2.5, 10.5], "texture": "#0"}, - "down": {"uv": [11, 2.5, 10.5, 3], "texture": "#0"} - } - }, - { - "from": [7.75, 0.06924, 11.64672], - "to": [8.25, 1.36924, 11.79672], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0.59424, 12.82172]}, - "faces": { - "north": {"uv": [3, 10.5, 3.5, 11], "texture": "#0"}, - "east": {"uv": [10.5, 3, 11, 3.5], "texture": "#0"}, - "south": {"uv": [3.5, 10.5, 4, 11], "texture": "#0"}, - "west": {"uv": [10.5, 3.5, 11, 4], "texture": "#0"}, - "up": {"uv": [4.5, 11, 4, 10.5], "texture": "#0"}, - "down": {"uv": [11, 4, 10.5, 4.5], "texture": "#0"} - } - }, - { - "from": [7.7, 2.45, -16], - "to": [8.3, 3.05, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [10.5, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [6.5, 5, 10, 5.5], "texture": "#0"}, - "south": {"uv": [6.5, 10.5, 7, 11], "texture": "#0"}, - "west": {"uv": [6.5, 5.5, 10, 6], "texture": "#0"}, - "up": {"uv": [1.5, 10, 1, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1.5, 10], "texture": "#0"} - } - }, - { - "from": [7.6, 2.35, -16], - "to": [8.4, 3.15, -14.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [10.5, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [6.5, 5, 10, 5.5], "texture": "#0"}, - "south": {"uv": [6.5, 10.5, 7, 11], "texture": "#0"}, - "west": {"uv": [6.5, 5.5, 10, 6], "texture": "#0"}, - "up": {"uv": [1.5, 10, 1, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1.5, 10], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [-1.5, 4.25, -2.75], - "scale": [0.7, 0.7, 0.7] - }, - "thirdperson_lefthand": { - "translation": [-1.5, 4.25, -2.75], - "scale": [0.7, 0.7, 0.7] - }, - "ground": { - "translation": [0, 3.25, 1], - "scale": [0.8, 0.8, 0.8] - }, - "head": { - "translation": [0, 18.75, 0] - }, - "fixed": { - "rotation": [90, -90, 90], - "translation": [-1.25, 7.75, 0], - "scale": [1.5, 1.5, 1.5] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 3.25, 7.75], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/m_98b_base.json b/src/main/resources/assets/superbwarfare/models/item/m_98b_base.json deleted file mode 100644 index 94b7c6bd0..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/m_98b_base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "superbwarfare:displaysettings/m98b.item", - "textures": { - "layer0": "superbwarfare:item/m98b" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/lod/m_98b.json b/src/main/resources/assets/superbwarfare/models/lod/m_98b.json new file mode 100644 index 000000000..096c853a1 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/lod/m_98b.json @@ -0,0 +1,2116 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [ + 32, + 32 + ], + "textures": { + "2": "superbwarfare:item/lod/m_98b", + "particle": "superbwarfare:item/lod/m_98b" + }, + "elements": [ + { + "from": [ + 7.5, + 2, + 1.25 + ], + "to": [ + 8.5, + 3.5, + 17.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1.5, + 11, + 1, + 3 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 2, + 3, + 1.5, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + -0.75, + 23.1 + ], + "to": [ + 8.5, + 3.5, + 24.35 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.1 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 3.2, + 17.5 + ], + "to": [ + 8.5, + 3.5, + 23.1 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 2.4, + 17.5 + ], + "to": [ + 8.5, + 2.7, + 23.1 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 1.7, + 16.75 + ], + "to": [ + 8.5, + 2, + 19.35 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + -1.17886, + 20.36673 + ], + "to": [ + 8.5, + 2.42114, + 20.66673 + ], + "rotation": { + "angle": -45, + "axis": "x", + "origin": [ + 8, + 0.62114, + 20.51673 + ] + }, + "faces": { + "north": { + "uv": [ + 2, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 1.5, + 11, + 1, + 3 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 4.5, + 5.5, + 4, + 4.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 5, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + -0.75772, + 21.68345 + ], + "to": [ + 8.5, + -0.45772, + 23.13345 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + -0.60772, + 23.48345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 0.49228, + 20.48345 + ], + "to": [ + 8.5, + 0.79228, + 23.13345 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + -0.60772, + 23.48345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 0.79228, + 20.28345 + ], + "to": [ + 8.5, + 3.29228, + 20.93345 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + -0.60772, + 23.48345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.7, + 3.59228, + 17.28345 + ], + "to": [ + 8.3, + 3.84228, + 22.18345 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + -0.60772, + 23.48345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.27626, + 3.41676, + 17.28345 + ], + "to": [ + 7.87626, + 3.66676, + 22.18345 + ], + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 7.57626, + 3.54176, + 19.73345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.27574, + 2.81802, + 17.28345 + ], + "to": [ + 7.52574, + 3.41802, + 22.18345 + ], + "rotation": { + "angle": 0, + "axis": "z", + "origin": [ + 7.40074, + 3.11802, + 19.73345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 2, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 1.5, + 11, + 1, + 3 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 8, + 1, + 0, + 0 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 8, + 1, + 0, + 2 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 8.47426, + 2.81802, + 17.28345 + ], + "to": [ + 8.72426, + 3.41802, + 22.18345 + ], + "rotation": { + "angle": 0, + "axis": "z", + "origin": [ + 8.59926, + 3.11802, + 19.73345 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 5.5, + 4.5, + 4.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 1.5, + 3, + 1, + 11 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 5.5, + 5, + 4.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 2, + 11, + 1.5, + 3 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 8, + 0, + 0, + 1 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 8, + 2, + 0, + 1 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 8.12374, + 3.41676, + 17.28345 + ], + "to": [ + 8.72374, + 3.66676, + 22.18345 + ], + "rotation": { + "angle": -45, + "axis": "z", + "origin": [ + 8.42374, + 3.54176, + 19.73345 + ] + }, + "faces": { + "north": { + "uv": [ + 4.5, + 4.5, + 4, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 8, + 1, + 0, + 2 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 8, + 0, + 0, + 1 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1.5, + 3, + 1, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 2, + 3, + 1.5, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 1.15, + 7.45 + ], + "to": [ + 8.5, + 2, + 13.85 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + -1.98039, + 11.18355 + ], + "to": [ + 8.5, + 1.31961, + 12.48355 + ], + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8, + 4.31961, + 12.23355 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.7, + 3.5, + 1.25 + ], + "to": [ + 8.3, + 3.7, + 14.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.7, + 3.7, + 7.25 + ], + "to": [ + 8.3, + 4, + 7.9 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.7, + 3.7, + 10 + ], + "to": [ + 8.3, + 4, + 10.65 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.6, + 4, + 4 + ], + "to": [ + 8.4, + 4.75, + 13.65 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 3.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 4.5, + 4.5, + 5.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 8, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 4.5, + 5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1, + 8, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 1, + 3, + 1.5, + 11 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 3, + 2, + 11 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.7, + -0.65, + 7.7 + ], + "to": [ + 8.3, + 2.75, + 10.7 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 3.25, + 8.75 + ] + }, + "faces": { + "north": { + "uv": [ + 2, + 4.5, + 2.5, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 2, + 3, + 3.5, + 4.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 2.5, + 4.5, + 3, + 6 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 3.5, + 3, + 5, + 4.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 3.5, + 6, + 3, + 4.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 4, + 4.5, + 3.5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.36924, + 11.24672 + ], + "to": [ + 8.25, + 0.46924, + 12.74672 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 0.36924, + 14.24672 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 5.5, + 4.5, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 3, + 6, + 3.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 4, + 6, + 4.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 3.5, + 6, + 4 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 5.5, + 5, + 5, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 5.5, + 5, + 5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.36924, + 10.89672 + ], + "to": [ + 8.25, + 1.21924, + 11.24672 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + -0.23076, + 14.74672 + ] + }, + "faces": { + "north": { + "uv": [ + 4.5, + 5.5, + 5, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5.5, + 4.5, + 6, + 5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 5, + 6, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5.5, + 5.5, + 6, + 6 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 2.5, + 6.5, + 2, + 6 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 3, + 6, + 2.5, + 6.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.06924, + 11.64672 + ], + "to": [ + 8.25, + 1.36924, + 11.79672 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + 0.59424, + 12.82172 + ] + }, + "faces": { + "north": { + "uv": [ + 3, + 6, + 3.5, + 6.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 6, + 3, + 6.5, + 3.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 3.5, + 6, + 4, + 6.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 6, + 3.5, + 6.5, + 4 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 4.5, + 6.5, + 4, + 6 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 6.5, + 4, + 6, + 4.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.7, + 2.45, + -16 + ], + "to": [ + 8.3, + 3.05, + 2 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4.5, + 6, + 5, + 6.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 2, + 9, + 2.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 4.5, + 6.5, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 2.5, + 9, + 3 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 0.5, + 12, + 0, + 3 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1, + 3, + 0.5, + 12 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.6, + 2.35, + -16 + ], + "to": [ + 8.4, + 3.15, + -14.1 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4.5, + 6, + 5, + 6.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 2, + 9, + 2.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 4.5, + 6.5, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 2.5, + 9, + 3 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 0, + 3, + 0.5, + 12 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 0.5, + 3, + 1, + 12 + ], + "texture": "#2" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ + -1.5, + 4.25, + -2.75 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "thirdperson_lefthand": { + "translation": [ + -1.5, + 4.25, + -2.75 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "ground": { + "translation": [ + 0, + 3.25, + 1 + ], + "scale": [ + 0.8, + 0.8, + 0.8 + ] + }, + "head": { + "translation": [ + 0, + 18.75, + 0 + ] + }, + "fixed": { + "rotation": [ + 90, + -90, + 90 + ], + "translation": [ + -1.25, + 7.75, + 0 + ], + "scale": [ + 1.5, + 1.5, + 1.5 + ] + } + }, + "groups": [ + { + "name": "group", + "origin": [ + 8, + 3.25, + 7.75 + ], + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25 + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/m98b_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/m_98b_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/gun_icon/m98b_icon.png rename to src/main/resources/assets/superbwarfare/textures/gun_icon/m_98b_icon.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/lod/m_98b.png b/src/main/resources/assets/superbwarfare/textures/item/lod/m_98b.png new file mode 100644 index 000000000..2fc32deee Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/lod/m_98b.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/m98b.png b/src/main/resources/assets/superbwarfare/textures/item/m_98b.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/m98b.png rename to src/main/resources/assets/superbwarfare/textures/item/m_98b.png