From 34e07ce8608b6f547ec5f8d5f5bc6eee7afef2d4 Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Fri, 6 Jun 2025 22:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96M4,HK416=E7=9A=84=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E4=BA=BA=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/Hk416ItemModel.java | 10 + .../client/model/item/M4ItemModel.java | 10 + .../renderer/gun/Hk416ItemRenderer.java | 50 +- .../client/renderer/gun/M4ItemRenderer.java | 52 +- .../superbwarfare/geo/lod/hk_416.geo.json | 448 ++++++++++++++++++ .../assets/superbwarfare/geo/lod/m_4.geo.json | 233 +++++++++ .../models/displaysettings/hk_416.item.json | 55 +++ .../models/displaysettings/m_4.item.json | 84 ++-- .../superbwarfare/models/lod/hk_416.json | 274 ----------- .../assets/superbwarfare/models/lod/m_4.json | 261 ---------- .../textures/item/lod/hk_416.png | Bin 359 -> 5245 bytes 11 files changed, 850 insertions(+), 627 deletions(-) create mode 100644 src/main/resources/assets/superbwarfare/geo/lod/hk_416.geo.json create mode 100644 src/main/resources/assets/superbwarfare/geo/lod/m_4.geo.json delete mode 100644 src/main/resources/assets/superbwarfare/models/lod/hk_416.json delete mode 100644 src/main/resources/assets/superbwarfare/models/lod/m_4.json diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java index 908272fad..a7fdbc497 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java @@ -39,6 +39,16 @@ public class Hk416ItemModel extends CustomGunModel { return Mod.loc("textures/item/hk_416.png"); } + @Override + public ResourceLocation getLODModelResource(Hk416Item animatable) { + return Mod.loc("geo/lod/hk_416.geo.json"); + } + + @Override + public ResourceLocation getLODTextureResource(Hk416Item animatable) { + return Mod.loc("textures/item/lod/hk_416.png"); + } + @Override public void setCustomAnimations(Hk416Item animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java index 333f20758..f2ecb5469 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M4ItemModel.java @@ -43,6 +43,16 @@ public class M4ItemModel extends CustomGunModel { return Mod.loc("textures/item/m_4.png"); } + @Override + public ResourceLocation getLODModelResource(M4Item animatable) { + return Mod.loc("geo/lod/m_4.geo.json"); + } + + @Override + public ResourceLocation getLODTextureResource(M4Item animatable) { + return Mod.loc("textures/item/lod/m_4.png"); + } + @Override public void setCustomAnimations(M4Item animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java index 32a5240fd..de4592f46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java @@ -42,30 +42,36 @@ public class Hk416ItemRenderer extends CustomGunRenderer { ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 - && (name.equals("hidden"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); - } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 - && (name.equals("jing") || name.equals("Barrel") || name.equals("yugu") || name.equals("qiangguan"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { + + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.440625, 0.3); + ItemModelHelper.handleGunAttachments(bone, itemStack, name); + + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 + && (name.equals("hidden"))) { + bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + } + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 + && (name.equals("jing") || name.equals("Barrel") || name.equals("yugu") || name.equals("qiangguan"))) { + bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + } + + int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); + + switch (scopeType) { + case 1 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.25, 30, 1, 0, 255, 0, 255, "eotech", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.313, 9, 1, 255, 0, 0, 255, "acog", true); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.29, 65, (float) ClientEventHandler.customZoom, 255, 0, 0, 255, "lpvo", true); + } } + + } else { + ItemModelHelper.hideAllAttachments(bone, name); } - - int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); - - switch (scopeType) { - case 1 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.25, 30, 1, 0, 255, 0, 255, "eotech", false); - case 2 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.313, 9, 1, 255, 0, 0, 255, "acog", true); - case 3 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.29, 65, (float) ClientEventHandler.customZoom, 255, 0, 0, 255, "lpvo", true); - } - - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.440625, 0.3); - ItemModelHelper.handleGunAttachments(bone, itemStack, name); } else { ItemModelHelper.hideAllAttachments(bone, name); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java index 0b82f9ef6..5d21af527 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java @@ -43,36 +43,42 @@ public class M4ItemRenderer extends CustomGunRenderer { ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.353125, 0.3); - ItemModelHelper.handleGunAttachments(bone, itemStack, name); - - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && !NBTTool.getTag(itemStack).getBoolean("ScopeAlt") && (name.equals("hidden"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); - } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 - && (name.equals("hidden2") || name.equals("yugu") || name.equals("qiangguan") || name.equals("Barrel"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); - } + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { if (name.equals("Sight")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3); } - } - int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.353125, 0.3); + ItemModelHelper.handleGunAttachments(bone, itemStack, name); - switch (scopeType) { - case 1 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.32, 30, 1.2f, 255, 0, 0, 255, "dot", false); - case 2 -> { - if (NBTTool.getTag(itemStack).getBoolean("ScopeAlt")) { - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.34, 30, 0.25f, 255, 0, 0, 255, "delta", false); - } else { - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.294, 13, 0.87f, 255, 0, 0, 255, "hamr", true); + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && !NBTTool.getTag(itemStack).getBoolean("ScopeAlt") && (name.equals("hidden"))) { + bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + } + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 + && (name.equals("hidden2") || name.equals("yugu") || name.equals("qiangguan") || name.equals("Barrel"))) { + bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + } + + int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); + + switch (scopeType) { + case 1 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.32, 30, 1.2f, 255, 0, 0, 255, "dot", false); + case 2 -> { + if (NBTTool.getTag(itemStack).getBoolean("ScopeAlt")) { + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.34, 30, 0.25f, 255, 0, 0, 255, "delta", false); + } else { + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.294, 13, 0.87f, 255, 0, 0, 255, "hamr", true); + } + } + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.283, 27, 2f, 255, 0, 0, 255, "sniper", true); } } - case 3 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.283, 27, 2f, 255, 0, 0, 255, "sniper", true); + + } else { + ItemModelHelper.hideAllAttachments(bone, name); } } else { ItemModelHelper.hideAllAttachments(bone, name); diff --git a/src/main/resources/assets/superbwarfare/geo/lod/hk_416.geo.json b/src/main/resources/assets/superbwarfare/geo/lod/hk_416.geo.json new file mode 100644 index 000000000..ba89939f6 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/lod/hk_416.geo.json @@ -0,0 +1,448 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.hk_416", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 4, + "visible_bounds_height": 2, + "visible_bounds_offset": [0, 0, 0] + }, + "bones": [ + { + "name": "bone", + "pivot": [0, 1.25, -4.2], + "cubes": [ + { + "origin": [-0.7496, -0.416, -4.2], + "size": [1.4992, 1.4988, 7.9964], + "uv": { + "north": {"uv": [27, 24], "uv_size": [1.5, 1.5]}, + "east": {"uv": [3, 17], "uv_size": [8, 1.5]}, + "west": {"uv": [18, 13], "uv_size": [8, 1.5]}, + "down": {"uv": [11, 26], "uv_size": [1.5, -8]} + } + }, + { + "origin": [-0.7346, 4.75035, 6.07013], + "size": [1.4692, 1.8988, 1.2464], + "pivot": [0.005, 6.41635, -0.67987], + "rotation": [-45, 0, 0], + "uv": { + "east": {"uv": [13, 27], "uv_size": [1, 2]}, + "south": {"uv": [19, 26], "uv_size": [1.5, 2]}, + "west": {"uv": [2, 28], "uv_size": [1, 2]} + } + }, + { + "origin": [-0.7496, 0.9168, 4.1464], + "size": [1.4992, 1.416, 10.9796], + "uv": { + "north": {"uv": [25, 27], "uv_size": [1.5, 1.5]}, + "east": {"uv": [0, 13], "uv_size": [11, 1.5]}, + "west": {"uv": [0, 15], "uv_size": [11, 1.5]}, + "down": {"uv": [15, 11], "uv_size": [1.5, -11]} + } + }, + { + "origin": [-0.71316, -3.05036, 15.126], + "size": [1.46276, 5.38316, 0.916], + "uv": { + "north": {"uv": [6, 19], "uv_size": [1.5, 5.5]}, + "east": {"uv": [2, 22], "uv_size": [1, 5.5]}, + "south": {"uv": [8, 19], "uv_size": [1.5, 5.5]}, + "west": {"uv": [15, 22], "uv_size": [1, 5.5]}, + "down": {"uv": [29, 1], "uv_size": [1.5, -1]} + } + }, + { + "origin": [0.28353, 2.1322, 15.126], + "size": [0.36276, 0.55, 0.916], + "pivot": [0.4558, 2.3572, 12.6101], + "rotation": [0, 0, -45], + "uv": { + "south": {"uv": [30, 10], "uv_size": [0.5, 0.5]}, + "west": {"uv": [0, 30], "uv_size": [1, 0.5]} + } + }, + { + "origin": [0.24709, 2.1322, 4.1464], + "size": [0.3992, 0.55, 10.9796], + "pivot": [0.4558, 2.3572, 12.6101], + "rotation": [0, 0, -45], + "uv": { + "west": {"uv": [16, 22], "uv_size": [11, 0.5]} + } + }, + { + "origin": [-0.08727, 2.30622, 15.126], + "size": [0.41276, 0.72, 0.916], + "pivot": [0.135, 2.53122, 12.6101], + "rotation": [0, 0, -90], + "uv": { + "south": {"uv": [30, 13], "uv_size": [0.5, 0.5]}, + "west": {"uv": [2, 30], "uv_size": [1, 0.5]} + } + }, + { + "origin": [-0.07371, 2.30622, 4.1464], + "size": [0.3992, 0.72, 10.9796], + "pivot": [0.135, 2.53122, 12.6101], + "rotation": [0, 0, -90], + "uv": { + "west": {"uv": [16, 23], "uv_size": [11, 0.5]} + } + }, + { + "origin": [-2.16842, 2.30705, 15.126], + "size": [0.36276, 0.55, 0.916], + "pivot": [-1.42793, 0.60726, 12.6101], + "rotation": [0, 0, 45], + "uv": { + "east": {"uv": [1, 30], "uv_size": [1, 0.5]}, + "south": {"uv": [13, 30], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-2.16842, 2.30705, 4.1464], + "size": [0.3992, 0.55, 10.9796], + "pivot": [-1.42793, 0.60726, 12.6101], + "rotation": [0, 0, 45], + "uv": { + "east": {"uv": [22, 21], "uv_size": [11, 0.5]} + } + }, + { + "origin": [-0.4496, -0.0824, 7.462], + "size": [0.8992, 0.9992, 7.664], + "uv": { + "north": {"uv": [29, 3], "uv_size": [1, 1]}, + "east": {"uv": [21, 15], "uv_size": [7.5, 1]}, + "south": {"uv": [29, 4], "uv_size": [1, 1]}, + "west": {"uv": [21, 16], "uv_size": [7.5, 1]}, + "down": {"uv": [10, 26.5], "uv_size": [1, -7.5]} + } + }, + { + "origin": [-0.3496, -0.7642, 11.30915], + "size": [0.6992, 0.7824, 5.9472], + "pivot": [0, 2.068, 11.92515], + "rotation": [-30, 0, 0], + "uv": { + "east": {"uv": [21, 17], "uv_size": [6, 1]}, + "west": {"uv": [21, 18], "uv_size": [6, 1]}, + "up": {"uv": [7, 25], "uv_size": [0.5, 6]}, + "down": {"uv": [8, 31], "uv_size": [0.5, -6]} + } + }, + { + "origin": [-0.7496, -2.082, -4.2], + "size": [1.4992, 1.666, 3.332], + "uv": { + "north": {"uv": [27, 27], "uv_size": [1.5, 1.5]}, + "east": {"uv": [16, 24], "uv_size": [3.5, 1.5]}, + "south": {"uv": [0, 28], "uv_size": [1.5, 1.5]}, + "west": {"uv": [20, 24], "uv_size": [3.5, 1.5]}, + "down": {"uv": [3, 26.5], "uv_size": [1.5, -3.5]} + } + }, + { + "origin": [-0.7496, -2.082, 1.5476], + "size": [1.4992, 1.666, 2.1824], + "uv": { + "north": {"uv": [15, 28], "uv_size": [1.5, 1.5]}, + "east": {"uv": [25, 24], "uv_size": [2, 1.5]}, + "south": {"uv": [17, 28], "uv_size": [1.5, 1.5]}, + "west": {"uv": [0, 26], "uv_size": [2, 1.5]} + } + }, + { + "origin": [-0.1246, -1.64961, 0.46746], + "size": [0.2492, 1.3148, 0.3324], + "pivot": [0.625, -1.36721, 0.88366], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [20, 29], "uv_size": [0.5, 1.5]}, + "east": {"uv": [21, 29], "uv_size": [0.5, 1.5]}, + "south": {"uv": [22, 29], "uv_size": [0.5, 1.5]}, + "west": {"uv": [24, 29], "uv_size": [0.5, 1.5]}, + "down": {"uv": [10, 30.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [-0.7496, -5.44961, 2.21746], + "size": [1.4992, 3.9648, 2.3324], + "pivot": [0, -3.46721, 3.38366], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [0, 22], "uv_size": [1.5, 4]}, + "east": {"uv": [18, 15], "uv_size": [2.5, 4]}, + "south": {"uv": [13, 22], "uv_size": [1.5, 4]}, + "west": {"uv": [3, 19], "uv_size": [2.5, 4]}, + "down": {"uv": [13, 20.5], "uv_size": [1.5, -2.5]} + } + }, + { + "origin": [-0.3996, -2.082, -0.868], + "size": [0.7992, 0.1832, 2.6656], + "uv": { + "east": {"uv": [29, 1], "uv_size": [2.5, 0.5]}, + "west": {"uv": [29, 2], "uv_size": [2.5, 0.5]}, + "up": {"uv": [4, 27], "uv_size": [1, 2.5]}, + "down": {"uv": [10, 29.5], "uv_size": [1, -2.5]} + } + }, + { + "origin": [-0.48304, -8.16405, -4.27122], + "size": [0.96608, 4.6648, 2.9988], + "pivot": [0, -4.49885, -1.93882], + "rotation": [-17.5, 0, 0], + "uv": { + "north": {"uv": [11, 13], "uv_size": [1, 4.5]}, + "east": {"uv": [15, 11], "uv_size": [3, 4.5]}, + "south": {"uv": [5, 23], "uv_size": [1, 4.5]}, + "west": {"uv": [15, 16], "uv_size": [3, 4.5]}, + "down": {"uv": [9, 28], "uv_size": [1, -3]} + } + }, + { + "origin": [-0.48304, -3.74591, -4.00148], + "size": [0.96608, 4.6648, 2.9988], + "uv": { + "north": {"uv": [24, 24], "uv_size": [1, 4.5]}, + "east": {"uv": [0, 17], "uv_size": [3, 4.5]}, + "south": {"uv": [6, 25], "uv_size": [1, 4.5]}, + "west": {"uv": [17, 0], "uv_size": [3, 4.5]} + } + }, + { + "origin": [-0.31144, 1.43856, -21.33411], + "size": [0.62288, 0.62288, 4.76406], + "pivot": [0, 1.75, -19.82708], + "rotation": [0, 0, 45], + "uv": { + "east": {"uv": [27, 17], "uv_size": [5, 0.5]}, + "west": {"uv": [27, 18], "uv_size": [5, 0.5]}, + "up": {"uv": [11, 27], "uv_size": [0.5, 5]}, + "down": {"uv": [12, 32], "uv_size": [0.5, -5]} + } + }, + { + "origin": [-0.3893, 1.3607, -24.13411], + "size": [0.7786, 0.7786, 2.8], + "pivot": [0, 1.75, -22.08411], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [29, 16], "uv_size": [1, 1]}, + "east": {"uv": [21, 26], "uv_size": [3, 1]}, + "south": {"uv": [19, 29], "uv_size": [1, 1]}, + "west": {"uv": [25, 26], "uv_size": [3, 1]}, + "up": {"uv": [14, 26], "uv_size": [1, 3]}, + "down": {"uv": [3, 30], "uv_size": [1, -3]} + } + }, + { + "origin": [-1.2853, 1.2643, -17.01806], + "size": [2.5706, 0.9956, 12.9112], + "uv": { + "north": {"uv": [16, 27], "uv_size": [2.5, 1]}, + "east": {"uv": [17, 5], "uv_size": [13, 1]}, + "south": {"uv": [27, 19], "uv_size": [2.5, 1]}, + "west": {"uv": [17, 6], "uv_size": [13, 1]}, + "up": {"uv": [6, 0], "uv_size": [2.5, 13]}, + "down": {"uv": [9, 13], "uv_size": [2.5, -13]} + } + }, + { + "origin": [-1.0353, 1.3343, -4.10686], + "size": [2.0706, 0.8556, 8.25], + "uv": { + "east": {"uv": [20, 1], "uv_size": [8.5, 1]}, + "south": {"uv": [19, 28], "uv_size": [2, 1]}, + "west": {"uv": [20, 2], "uv_size": [8.5, 1]} + } + }, + { + "origin": [-1.0353, 1.3343, -4.10686], + "size": [2.0706, 0.8556, 8.25], + "pivot": [0, 1.7621, 0.01814], + "rotation": [0, 0, -45], + "uv": { + "east": {"uv": [20, 3], "uv_size": [8.5, 1]}, + "south": {"uv": [21, 28], "uv_size": [2, 1]}, + "west": {"uv": [20, 4], "uv_size": [8.5, 1]} + } + }, + { + "origin": [-1.0353, 1.3343, -4.10686], + "size": [2.0706, 0.8556, 8.25], + "pivot": [0, 1.7621, 0.01814], + "rotation": [0, 0, 45], + "uv": { + "east": {"uv": [18, 20], "uv_size": [8.5, 1]}, + "south": {"uv": [28, 26], "uv_size": [2, 1]}, + "west": {"uv": [13, 21], "uv_size": [8.5, 1]} + } + }, + { + "origin": [-1.13584, 1.20526, -17.01806], + "size": [2.2956, 0.8956, 12.9112], + "pivot": [-0.12554, 1.70306, -10.56246], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [27, 20], "uv_size": [2.5, 1]}, + "east": {"uv": [17, 9], "uv_size": [13, 1]}, + "south": {"uv": [21, 27], "uv_size": [2.5, 1]}, + "west": {"uv": [17, 10], "uv_size": [13, 1]} + } + }, + { + "origin": [-1.15976, 1.20526, -17.01806], + "size": [2.2956, 0.8956, 12.9112], + "pivot": [0.12554, 1.70306, -10.56246], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [27, 22], "uv_size": [2.5, 1]}, + "east": {"uv": [18, 11], "uv_size": [13, 1]}, + "south": {"uv": [27, 23], "uv_size": [2.5, 1]}, + "west": {"uv": [18, 12], "uv_size": [13, 1]} + } + }, + { + "origin": [-1.5353, 1.2643, -17.01806], + "size": [3.0706, 0.9956, 12.9112], + "pivot": [0, 1.7621, -10.56246], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [11, 26], "uv_size": [3, 1]}, + "east": {"uv": [17, 7], "uv_size": [13, 1]}, + "south": {"uv": [26, 13], "uv_size": [3, 1]}, + "west": {"uv": [17, 8], "uv_size": [13, 1]}, + "up": {"uv": [0, 0], "uv_size": [3, 13]}, + "down": {"uv": [3, 13], "uv_size": [3, -13]} + } + }, + { + "origin": [-1.5353, 1.2643, -4.10686], + "size": [3.0706, 0.9956, 8.25], + "pivot": [0, 1.7621, -10.56246], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [26, 14], "uv_size": [3, 1]}, + "east": {"uv": [18, 19], "uv_size": [8.5, 1]}, + "south": {"uv": [16, 26], "uv_size": [3, 1]}, + "west": {"uv": [20, 0], "uv_size": [8.5, 1]}, + "up": {"uv": [12, 0], "uv_size": [3, 8.5]}, + "down": {"uv": [12, 17.5], "uv_size": [3, -8.5]} + } + }, + { + "origin": [-0.6164, 3.0164, -16.81064], + "size": [1.2328, 0.5656, 0.7828], + "uv": { + "north": {"uv": [29, 25], "uv_size": [1, 0.5]}, + "east": {"uv": [27, 29], "uv_size": [1, 0.5]}, + "south": {"uv": [29, 27], "uv_size": [1, 0.5]}, + "west": {"uv": [28, 29], "uv_size": [1, 0.5]}, + "up": {"uv": [13, 29], "uv_size": [1, 1]}, + "down": {"uv": [29, 14], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.5164, 0.9164, -17.61064], + "size": [1.0328, 1.9156, 0.5828], + "uv": { + "north": {"uv": [5, 28], "uv_size": [1, 2]}, + "east": {"uv": [14, 29], "uv_size": [0.5, 2]}, + "west": {"uv": [29, 14], "uv_size": [0.5, 2]}, + "up": {"uv": [9, 30], "uv_size": [1, 0.5]}, + "down": {"uv": [30, 9.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [-0.3664, 3.582, -16.71064], + "size": [0.7328, 0.95, 0.4828], + "uv": { + "north": {"uv": [3, 30], "uv_size": [0.5, 1]}, + "east": {"uv": [30, 3], "uv_size": [0.5, 1]}, + "south": {"uv": [4, 30], "uv_size": [0.5, 1]}, + "west": {"uv": [30, 4], "uv_size": [0.5, 1]}, + "up": {"uv": [30, 14], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [-0.5832, 3.0664, 1.29672], + "size": [1.1664, 0.7156, 1.51648], + "uv": { + "north": {"uv": [29, 28], "uv_size": [1, 0.5]}, + "east": {"uv": [29, 24], "uv_size": [1.5, 0.5]}, + "south": {"uv": [29, 29], "uv_size": [1, 0.5]}, + "west": {"uv": [25, 29], "uv_size": [1.5, 0.5]}, + "up": {"uv": [9, 28], "uv_size": [1, 1.5]}, + "down": {"uv": [23, 29.5], "uv_size": [1, -1.5]} + } + }, + { + "origin": [-0.3582, 3.77791, 1.29353], + "size": [0.7164, 0.4656, 0.66648], + "pivot": [-0.075, 4.23571, 2.00177], + "rotation": [7.5, 0, 0], + "uv": { + "north": {"uv": [15, 30], "uv_size": [0.5, 0.5]}, + "east": {"uv": [30, 15], "uv_size": [0.5, 0.5]}, + "south": {"uv": [16, 30], "uv_size": [0.5, 0.5]}, + "west": {"uv": [30, 16], "uv_size": [0.5, 0.5]}, + "up": {"uv": [17, 30], "uv_size": [0.5, 0.5]} + } + }, + { + "origin": [0.4668, 3.782, 1.99672], + "size": [0.1164, 0.4656, 0.81648], + "uv": { + "north": {"uv": [18, 30], "uv_size": [0.5, 0.5]}, + "east": {"uv": [5, 30], "uv_size": [1, 0.5]}, + "south": {"uv": [19, 30], "uv_size": [0.5, 0.5]}, + "west": {"uv": [30, 5], "uv_size": [1, 0.5]}, + "up": {"uv": [6, 30], "uv_size": [0.5, 1]} + } + }, + { + "origin": [-0.5832, 3.782, 1.99672], + "size": [0.1164, 0.4656, 0.81648], + "uv": { + "north": {"uv": [30, 19], "uv_size": [0.5, 0.5]}, + "east": {"uv": [30, 6], "uv_size": [1, 0.5]}, + "south": {"uv": [30, 20], "uv_size": [0.5, 0.5]}, + "west": {"uv": [30, 7], "uv_size": [1, 0.5]}, + "up": {"uv": [30, 8], "uv_size": [0.5, 1]} + } + } + ] + } + ], + "item_display_transforms": { + "thirdperson_righthand": { + "translation": [-0.75, 0.25, -0.25], + "scale": [0.6, 0.6, 0.6] + }, + "thirdperson_lefthand": { + "scale": [0, 0, 0] + }, + "ground": { + "translation": [0, 3.75, 2.75], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "translation": [0, 12.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [-2, 1, 0], + "scale": [1.25, 1.25, 1.25] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/lod/m_4.geo.json b/src/main/resources/assets/superbwarfare/geo/lod/m_4.geo.json new file mode 100644 index 000000000..c2b4c2131 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/lod/m_4.geo.json @@ -0,0 +1,233 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.m_4", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 3, + "visible_bounds_height": 2, + "visible_bounds_offset": [0, 0, 0] + }, + "bones": [ + { + "name": "m4", + "pivot": [0, 1.25, -4.2], + "cubes": [ + { + "origin": [-0.9996, -0.416, -4.2], + "size": [1.9992, 2.9988, 8.9964], + "uv": { + "north": {"uv": [17, 17], "uv_size": [2, 2]}, + "east": {"uv": [0, 0], "uv_size": [7, 2]}, + "south": {"uv": [0, 18], "uv_size": [2, 2]}, + "west": {"uv": [0, 2], "uv_size": [7, 2]}, + "up": {"uv": [0, 4], "uv_size": [2, 7]}, + "down": {"uv": [2, 11], "uv_size": [2, -7]} + } + }, + { + "origin": [-0.9996, 0.9168, 4.7964], + "size": [1.9992, 1.666, 9.3296], + "uv": { + "north": {"uv": [20, 12], "uv_size": [2, 1]}, + "east": {"uv": [14, 8], "uv_size": [7, 1]}, + "south": {"uv": [20, 14], "uv_size": [2, 1]}, + "west": {"uv": [16, 13], "uv_size": [7, 1]}, + "up": {"uv": [4, 4], "uv_size": [2, 7]}, + "down": {"uv": [6, 11], "uv_size": [2, -7]} + } + }, + { + "origin": [-1.53272, 0.51696, -13.72952], + "size": [3.06544, 1.666, 9.3296], + "uv": { + "north": {"uv": [20, 12], "uv_size": [2, 1]}, + "east": {"uv": [14, 8], "uv_size": [7, 1]}, + "south": {"uv": [20, 14], "uv_size": [2, 1]}, + "west": {"uv": [16, 13], "uv_size": [7, 1]}, + "up": {"uv": [4, 4], "uv_size": [2, 7]}, + "down": {"uv": [6, 11], "uv_size": [2, -7]} + } + }, + { + "origin": [-0.98138, -3.0816, 12.7932], + "size": [1.96276, 5.63316, 1.666], + "uv": { + "north": {"uv": [4, 13], "uv_size": [2, 4]}, + "east": {"uv": [18, 0], "uv_size": [1, 4]}, + "south": {"uv": [6, 13], "uv_size": [2, 4]}, + "west": {"uv": [2, 18], "uv_size": [1, 4]}, + "up": {"uv": [20, 15], "uv_size": [2, 1]}, + "down": {"uv": [20, 20], "uv_size": [2, -1]} + } + }, + { + "origin": [-0.9996, -1.0824, 7.462], + "size": [1.9992, 1.9992, 6.664], + "uv": { + "north": {"uv": [18, 4], "uv_size": [2, 2]}, + "east": {"uv": [0, 11], "uv_size": [5, 2]}, + "south": {"uv": [18, 6], "uv_size": [2, 2]}, + "west": {"uv": [5, 11], "uv_size": [5, 2]}, + "up": {"uv": [10, 11], "uv_size": [2, 5]}, + "down": {"uv": [12, 9], "uv_size": [2, -5]} + } + }, + { + "origin": [-0.9996, -1.0824, 7.7952], + "size": [1.9992, 2.3324, 6.9972], + "pivot": [0, 1.7498, 9.4612], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [12, 18], "uv_size": [2, 2]}, + "east": {"uv": [12, 9], "uv_size": [5, 2]}, + "south": {"uv": [14, 18], "uv_size": [2, 2]}, + "west": {"uv": [12, 11], "uv_size": [5, 2]}, + "up": {"uv": [0, 13], "uv_size": [2, 5]}, + "down": {"uv": [2, 18], "uv_size": [2, -5]} + } + }, + { + "origin": [-0.9996, -0.22926, 6.83818], + "size": [1.9992, 1.666, 2.9988], + "uv": { + "north": {"uv": [20, 20], "uv_size": [2, 1]}, + "east": {"uv": [21, 0], "uv_size": [2, 1]}, + "south": {"uv": [21, 1], "uv_size": [2, 1]}, + "west": {"uv": [21, 2], "uv_size": [2, 1]}, + "up": {"uv": [18, 14], "uv_size": [2, 2]}, + "down": {"uv": [19, 2], "uv_size": [2, -2]} + } + }, + { + "origin": [-0.9996, -2.082, -4.2], + "size": [1.9992, 1.666, 3.332], + "uv": { + "north": {"uv": [21, 3], "uv_size": [2, 1]}, + "east": {"uv": [17, 12], "uv_size": [3, 1]}, + "south": {"uv": [21, 4], "uv_size": [2, 1]}, + "west": {"uv": [19, 18], "uv_size": [3, 1]}, + "up": {"uv": [16, 14], "uv_size": [2, 3]}, + "down": {"uv": [4, 20], "uv_size": [2, -3]} + } + }, + { + "origin": [-0.9996, -2.082, 1.7976], + "size": [1.9992, 1.666, 2.3324], + "uv": { + "north": {"uv": [21, 5], "uv_size": [2, 1]}, + "east": {"uv": [21, 6], "uv_size": [2, 1]}, + "south": {"uv": [21, 7], "uv_size": [2, 1]}, + "west": {"uv": [21, 8], "uv_size": [2, 1]}, + "up": {"uv": [19, 2], "uv_size": [2, 2]}, + "down": {"uv": [16, 21], "uv_size": [2, -2]} + } + }, + { + "origin": [-0.9996, -6.84825, 1.28756], + "size": [1.9992, 4.6648, 2.3324], + "pivot": [0, -0.85065, 1.28756], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [8, 13], "uv_size": [2, 4]}, + "east": {"uv": [12, 13], "uv_size": [2, 4]}, + "south": {"uv": [14, 0], "uv_size": [2, 4]}, + "west": {"uv": [14, 4], "uv_size": [2, 4]}, + "up": {"uv": [19, 16], "uv_size": [2, 2]}, + "down": {"uv": [18, 21], "uv_size": [2, -2]} + } + }, + { + "origin": [-0.9996, -2.082, -0.868], + "size": [1.9992, 0.3332, 2.6656], + "uv": { + "north": {"uv": [16, 21], "uv_size": [2, 1]}, + "east": {"uv": [21, 16], "uv_size": [2, 1]}, + "south": {"uv": [21, 17], "uv_size": [2, 1]}, + "west": {"uv": [18, 21], "uv_size": [2, 1]}, + "up": {"uv": [0, 20], "uv_size": [2, 2]}, + "down": {"uv": [3, 22], "uv_size": [2, -2]} + } + }, + { + "origin": [-0.73304, -8.0796, -4.33328], + "size": [1.46608, 4.6648, 2.9988], + "pivot": [0, -4.4144, -2.00088], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [20, 4], "uv_size": [1, 4]}, + "east": {"uv": [14, 13], "uv_size": [2, 4]}, + "south": {"uv": [5, 20], "uv_size": [1, 4]}, + "west": {"uv": [16, 0], "uv_size": [2, 4]}, + "up": {"uv": [3, 18], "uv_size": [1, 2]}, + "down": {"uv": [20, 23], "uv_size": [1, -2]} + } + }, + { + "origin": [-0.73304, -3.74591, -4.00148], + "size": [1.46608, 4.6648, 2.9988], + "uv": { + "north": {"uv": [10, 20], "uv_size": [1, 4]}, + "east": {"uv": [16, 4], "uv_size": [2, 4]}, + "south": {"uv": [11, 20], "uv_size": [1, 4]}, + "west": {"uv": [10, 16], "uv_size": [2, 4]}, + "up": {"uv": [21, 21], "uv_size": [1, 2]}, + "down": {"uv": [0, 24], "uv_size": [1, -2]} + } + }, + { + "origin": [-0.6664, 0.5836, -23.65888], + "size": [1.3328, 1.3328, 7.6636], + "uv": { + "north": {"uv": [16, 18], "uv_size": [1, 1]}, + "east": {"uv": [17, 9], "uv_size": [6, 1]}, + "south": {"uv": [18, 16], "uv_size": [1, 1]}, + "west": {"uv": [17, 10], "uv_size": [6, 1]}, + "up": {"uv": [6, 17], "uv_size": [1, 6]}, + "down": {"uv": [7, 23], "uv_size": [1, -6]} + } + }, + { + "origin": [-1.3328, -0.0828, -17.79456], + "size": [2.6656, 2.6656, 13.6612], + "uv": { + "north": {"uv": [16, 18], "uv_size": [1, 1]}, + "east": {"uv": [17, 9], "uv_size": [6, 1]}, + "south": {"uv": [18, 16], "uv_size": [1, 1]}, + "west": {"uv": [17, 10], "uv_size": [6, 1]}, + "up": {"uv": [6, 17], "uv_size": [1, 6]}, + "down": {"uv": [7, 23], "uv_size": [1, -6]} + } + }, + { + "origin": [-0.6664, 1.9164, -19.26064], + "size": [1.3328, 2.6656, 1.3328], + "uv": { + "north": {"uv": [1, 22], "uv_size": [1, 2]}, + "east": {"uv": [2, 22], "uv_size": [1, 2]}, + "south": {"uv": [3, 22], "uv_size": [1, 2]}, + "west": {"uv": [4, 22], "uv_size": [1, 2]}, + "up": {"uv": [16, 22], "uv_size": [1, 1]}, + "down": {"uv": [17, 23], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.3332, 1.9164, 3.99672], + "size": [0.6664, 2.6656, 0.46648], + "uv": { + "north": {"uv": [8, 22], "uv_size": [1, 2]}, + "east": {"uv": [9, 22], "uv_size": [1, 2]}, + "south": {"uv": [22, 11], "uv_size": [1, 2]}, + "west": {"uv": [12, 22], "uv_size": [1, 2]}, + "up": {"uv": [18, 22], "uv_size": [1, 1]}, + "down": {"uv": [22, 19], "uv_size": [1, -1]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/hk_416.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/hk_416.item.json index 8b7c1220b..bcf3afeb1 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/hk_416.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/hk_416.item.json @@ -29,6 +29,61 @@ 0, 0 ] + }, + "thirdperson_righthand": { + "translation": [ + -0.75, + 0.25, + -0.25 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 3.75, + 2.75 + ], + "scale": [ + 0.65, + 0.65, + 0.65 + ] + }, + "head": { + "translation": [ + 0, + 12.5, + 0.5 + ] + }, + "fixed": { + "rotation": [ + 0, + -90, + 0 + ], + "translation": [ + -2, + 1, + 0 + ], + "scale": [ + 1.25, + 1.25, + 1.25 + ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/m_4.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/m_4.item.json index 041268bbf..fb8490502 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/m_4.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/m_4.item.json @@ -6,30 +6,6 @@ 128 ], "display": { - "thirdperson_righthand": { - "translation": [ - 0, - 0.75, - -3.25 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "thirdperson_lefthand": { - "translation": [ - 0, - 0.75, - -3.25 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, "firstperson_righthand": { "translation": [ 2.75, @@ -59,23 +35,11 @@ 0 ] }, - "ground": { + "thirdperson_righthand": { "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 1, - 1, - 1 - ] - }, - "gui": { - "rotation": [ - 30, - -145, - 0 + -0.75, + 0.25, + -0.25 ], "scale": [ 0.6, @@ -83,21 +47,47 @@ 0.6 ] }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 3.75, + 2.75 + ], + "scale": [ + 0.65, + 0.65, + 0.65 + ] + }, + "head": { + "translation": [ + 0, + 12.5, + 0.5 + ] + }, "fixed": { "rotation": [ 0, - 90, + -90, 0 ], "translation": [ - -1.75, - -0.25, - -2 + -2, + 1, + 0 ], "scale": [ - 1.1, - 1.1, - 1.1 + 1.25, + 1.25, + 1.25 ] } } diff --git a/src/main/resources/assets/superbwarfare/models/lod/hk_416.json b/src/main/resources/assets/superbwarfare/models/lod/hk_416.json deleted file mode 100644 index e593e2c09..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/hk_416.json +++ /dev/null @@ -1,274 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/lod/hk_416", - "particle": "superbwarfare:item/lod/hk_416" - }, - "elements": [ - { - "from": [7.25, 5.75, 6.5], - "to": [8.75, 8, 13.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [8.5, 8.5, 9.5, 9.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3.5, 1], "texture": "#0"}, - "south": {"uv": [0, 9, 1, 10], "texture": "#0"}, - "west": {"uv": [0, 1, 3.5, 2], "texture": "#0"}, - "up": {"uv": [1, 5.5, 0, 2], "texture": "#0"}, - "down": {"uv": [2, 2, 1, 5.5], "texture": "#0"} - } - }, - { - "from": [7.25, 6.75, 13.25], - "to": [8.75, 8, 20.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [10, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [7, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10, 7, 11, 7.5], "texture": "#0"}, - "west": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"}, - "up": {"uv": [3, 5.5, 2, 2], "texture": "#0"}, - "down": {"uv": [4, 2, 3, 5.5], "texture": "#0"} - } - }, - { - "from": [7.25, 3.75, 19.25], - "to": [8.75, 8, 20.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [2, 6.5, 3, 8.5], "texture": "#0"}, - "east": {"uv": [9, 0, 9.5, 2], "texture": "#0"}, - "south": {"uv": [3, 6.5, 4, 8.5], "texture": "#0"}, - "west": {"uv": [1, 9, 1.5, 11], "texture": "#0"}, - "up": {"uv": [11, 8, 10, 7.5], "texture": "#0"}, - "down": {"uv": [11, 9.5, 10, 10], "texture": "#0"} - } - }, - { - "from": [7.25, 5.25, 15.25], - "to": [8.75, 6.75, 20.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [9, 2, 10, 3], "texture": "#0"}, - "east": {"uv": [0, 5.5, 2.5, 6.5], "texture": "#0"}, - "south": {"uv": [9, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [2.5, 5.5, 5, 6.5], "texture": "#0"}, - "up": {"uv": [6, 8, 5, 5.5], "texture": "#0"}, - "down": {"uv": [7, 2, 6, 4.5], "texture": "#0"} - } - }, - { - "from": [7.25, 5.25, 15.5], - "to": [8.75, 7, 20.75], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7.375, 16.75]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "texture": "#0"}, - "east": {"uv": [6, 4.5, 8.5, 5.5], "texture": "#0"}, - "south": {"uv": [7, 9, 8, 10], "texture": "#0"}, - "west": {"uv": [6, 5.5, 8.5, 6.5], "texture": "#0"}, - "up": {"uv": [1, 9, 0, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1, 9], "texture": "#0"} - } - }, - { - "from": [7.25, 5.89011, 14.78195], - "to": [8.75, 7.14011, 17.03195], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8.01511, 16.03195]}, - "faces": { - "north": {"uv": [10, 10, 11, 10.5], "texture": "#0"}, - "east": {"uv": [10.5, 0, 11.5, 0.5], "texture": "#0"}, - "south": {"uv": [10.5, 0.5, 11.5, 1], "texture": "#0"}, - "west": {"uv": [10.5, 1, 11.5, 1.5], "texture": "#0"}, - "up": {"uv": [10, 8, 9, 7], "texture": "#0"}, - "down": {"uv": [10.5, 0, 9.5, 1], "texture": "#0"} - } - }, - { - "from": [7.25, 4.5, 6.5], - "to": [8.75, 5.75, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [10.5, 1.5, 11.5, 2], "texture": "#0"}, - "east": {"uv": [8.5, 6, 10, 6.5], "texture": "#0"}, - "south": {"uv": [10.5, 2, 11.5, 2.5], "texture": "#0"}, - "west": {"uv": [9.5, 9, 11, 9.5], "texture": "#0"}, - "up": {"uv": [9, 8.5, 8, 7], "texture": "#0"}, - "down": {"uv": [3, 8.5, 2, 10], "texture": "#0"} - } - }, - { - "from": [7.25, 4.5, 11], - "to": [8.75, 5.75, 12.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 11]}, - "faces": { - "north": {"uv": [10.5, 2.5, 11.5, 3], "texture": "#0"}, - "east": {"uv": [10.5, 3, 11.5, 3.5], "texture": "#0"}, - "south": {"uv": [10.5, 3.5, 11.5, 4], "texture": "#0"}, - "west": {"uv": [10.5, 4, 11.5, 4.5], "texture": "#0"}, - "up": {"uv": [10.5, 2, 9.5, 1], "texture": "#0"}, - "down": {"uv": [9, 9.5, 8, 10.5], "texture": "#0"} - } - }, - { - "from": [7.25, 0.92388, 10.61732], - "to": [8.75, 4.42388, 12.36732], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5.42388, 10.61732]}, - "faces": { - "north": {"uv": [4, 6.5, 5, 8.5], "texture": "#0"}, - "east": {"uv": [6, 6.5, 7, 8.5], "texture": "#0"}, - "south": {"uv": [7, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [7, 2, 8, 4], "texture": "#0"}, - "up": {"uv": [10.5, 9, 9.5, 8], "texture": "#0"}, - "down": {"uv": [10, 9.5, 9, 10.5], "texture": "#0"} - } - }, - { - "from": [7.25, 4.5, 9], - "to": [8.75, 4.75, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [8, 10.5, 9, 11], "texture": "#0"}, - "east": {"uv": [10.5, 8, 11.5, 8.5], "texture": "#0"}, - "south": {"uv": [10.5, 8.5, 11.5, 9], "texture": "#0"}, - "west": {"uv": [9, 10.5, 10, 11], "texture": "#0"}, - "up": {"uv": [1, 11, 0, 10], "texture": "#0"}, - "down": {"uv": [2.5, 10, 1.5, 11], "texture": "#0"} - } - }, - { - "from": [7.45, 0, 6.4], - "to": [8.55, 3.5, 8.65], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 2.75, 8.15]}, - "faces": { - "north": {"uv": [10, 2, 10.5, 4], "texture": "#0"}, - "east": {"uv": [7, 6.5, 8, 8.5], "texture": "#0"}, - "south": {"uv": [2.5, 10, 3, 12], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 2], "texture": "#0"}, - "up": {"uv": [2, 10, 1.5, 9], "texture": "#0"}, - "down": {"uv": [10.5, 10.5, 10, 11.5], "texture": "#0"} - } - }, - { - "from": [7.45, 3.25157, 6.64895], - "to": [8.55, 6.75157, 8.89895], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 6.00157, 8.39895]}, - "faces": { - "north": {"uv": [5, 10, 5.5, 12], "texture": "#0"}, - "east": {"uv": [8, 2, 9, 4], "texture": "#0"}, - "south": {"uv": [5.5, 10, 6, 12], "texture": "#0"}, - "west": {"uv": [5, 8, 6, 10], "texture": "#0"}, - "up": {"uv": [11, 11.5, 10.5, 10.5], "texture": "#0"}, - "down": {"uv": [0.5, 11, 0, 12], "texture": "#0"} - } - }, - { - "from": [7, 6, 0.75], - "to": [9, 8, 6.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [6, 10, 7, 11], "texture": "#0"}, - "east": {"uv": [3.5, 0, 7, 1], "texture": "#0"}, - "south": {"uv": [7, 10, 8, 11], "texture": "#0"}, - "west": {"uv": [3.5, 1, 7, 2], "texture": "#0"}, - "up": {"uv": [5, 5.5, 4, 2], "texture": "#0"}, - "down": {"uv": [6, 2, 5, 5.5], "texture": "#0"} - } - }, - { - "from": [7.5, 6.5, -1.25], - "to": [8.5, 7.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [8, 9, 8.5, 9.5], "texture": "#0"}, - "east": {"uv": [8.5, 4.5, 11.5, 5], "texture": "#0"}, - "south": {"uv": [9, 8, 9.5, 8.5], "texture": "#0"}, - "west": {"uv": [8.5, 5, 11.5, 5.5], "texture": "#0"}, - "up": {"uv": [3.5, 11.5, 3, 8.5], "texture": "#0"}, - "down": {"uv": [4, 8.5, 3.5, 11.5], "texture": "#0"} - } - }, - { - "from": [7, 7.5, 6.85], - "to": [9, 8.75, 9.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 12], "texture": "#0"}, - "east": {"uv": [4.5, 11, 5, 12], "texture": "#0"}, - "south": {"uv": [11, 5.5, 11.5, 6.5], "texture": "#0"}, - "west": {"uv": [6, 11, 6.5, 12], "texture": "#0"}, - "up": {"uv": [9.5, 11.5, 9, 11], "texture": "#0"}, - "down": {"uv": [11.5, 9, 11, 9.5], "texture": "#0"} - } - }, - { - "from": [7, 9.75, 8.1], - "to": [9, 10, 9.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 12], "texture": "#0"}, - "east": {"uv": [4.5, 11, 5, 12], "texture": "#0"}, - "south": {"uv": [11, 5.5, 11.5, 6.5], "texture": "#0"}, - "west": {"uv": [6, 11, 6.5, 12], "texture": "#0"}, - "up": {"uv": [9.5, 11.5, 9, 11], "texture": "#0"}, - "down": {"uv": [11.5, 9, 11, 9.5], "texture": "#0"} - } - }, - { - "from": [7, 8.75, 8.1], - "to": [7.25, 9.75, 9.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 12], "texture": "#0"}, - "east": {"uv": [4.5, 11, 5, 12], "texture": "#0"}, - "south": {"uv": [11, 5.5, 11.5, 6.5], "texture": "#0"}, - "west": {"uv": [6, 11, 6.5, 12], "texture": "#0"}, - "up": {"uv": [9.5, 11.5, 9, 11], "texture": "#0"}, - "down": {"uv": [11.5, 9, 11, 9.5], "texture": "#0"} - } - }, - { - "from": [8.75, 8.75, 8.1], - "to": [9, 9.75, 9.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 12], "texture": "#0"}, - "east": {"uv": [4.5, 11, 5, 12], "texture": "#0"}, - "south": {"uv": [11, 5.5, 11.5, 6.5], "texture": "#0"}, - "west": {"uv": [6, 11, 6.5, 12], "texture": "#0"}, - "up": {"uv": [9.5, 11.5, 9, 11], "texture": "#0"}, - "down": {"uv": [11.5, 9, 11, 9.5], "texture": "#0"} - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [-0.75, 1.5, -1.5], - "scale": [0.7, 0.7, 0.7] - }, - "thirdperson_lefthand": { - "scale": [0, 0, 0] - }, - "ground": { - "translation": [0, 5.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "head": { - "translation": [0, 12.5, -2.25] - }, - "fixed": { - "rotation": [90, -45, 90], - "translation": [-1.5, 1, 0], - "scale": [0.9, 0.9, 0.9] - } - }, - "groups": [ - { - "name": "m4", - "origin": [8, 7, 6.5], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/lod/m_4.json b/src/main/resources/assets/superbwarfare/models/lod/m_4.json deleted file mode 100644 index e41954712..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/m_4.json +++ /dev/null @@ -1,261 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/lod/m_4", - "particle": "superbwarfare:item/lod/m_4" - }, - "elements": [ - { - "from": [7.25, 5.75, 6.5], - "to": [8.75, 8, 13.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [8.5, 8.5, 9.5, 9.5], "texture": "#0"}, - "east": {"uv": [0, 0, 3.5, 1], "texture": "#0"}, - "south": {"uv": [0, 9, 1, 10], "texture": "#0"}, - "west": {"uv": [0, 1, 3.5, 2], "texture": "#0"}, - "up": {"uv": [1, 5.5, 0, 2], "texture": "#0"}, - "down": {"uv": [2, 2, 1, 5.5], "texture": "#0"} - } - }, - { - "from": [7.25, 6.75, 13.25], - "to": [8.75, 8, 20.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [10, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [7, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10, 7, 11, 7.5], "texture": "#0"}, - "west": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"}, - "up": {"uv": [3, 5.5, 2, 2], "texture": "#0"}, - "down": {"uv": [4, 2, 3, 5.5], "texture": "#0"} - } - }, - { - "from": [6.85, 6.45, -0.65], - "to": [9.15, 7.7, 6.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.7, -7.4]}, - "faces": { - "north": {"uv": [10, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [7, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10, 7, 11, 7.5], "texture": "#0"}, - "west": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"}, - "up": {"uv": [3, 5.5, 2, 2], "texture": "#0"}, - "down": {"uv": [4, 2, 3, 5.5], "texture": "#0"} - } - }, - { - "from": [7.26367, 3.75, 19.25], - "to": [8.73633, 7.97656, 20.5], - "rotation": {"angle": 0, "axis": "y", "origin": [7.98633, 7, 6.5]}, - "faces": { - "north": {"uv": [2, 6.5, 3, 8.5], "texture": "#0"}, - "east": {"uv": [9, 0, 9.5, 2], "texture": "#0"}, - "south": {"uv": [3, 6.5, 4, 8.5], "texture": "#0"}, - "west": {"uv": [1, 9, 1.5, 11], "texture": "#0"}, - "up": {"uv": [11, 8, 10, 7.5], "texture": "#0"}, - "down": {"uv": [11, 9.5, 10, 10], "texture": "#0"} - } - }, - { - "from": [7.25, 5.25, 15.25], - "to": [8.75, 6.75, 20.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [9, 2, 10, 3], "texture": "#0"}, - "east": {"uv": [0, 5.5, 2.5, 6.5], "texture": "#0"}, - "south": {"uv": [9, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [2.5, 5.5, 5, 6.5], "texture": "#0"}, - "up": {"uv": [6, 8, 5, 5.5], "texture": "#0"}, - "down": {"uv": [7, 2, 6, 4.5], "texture": "#0"} - } - }, - { - "from": [7.25, 5.25, 15.5], - "to": [8.75, 7, 20.75], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7.375, 16.75]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "texture": "#0"}, - "east": {"uv": [6, 4.5, 8.5, 5.5], "texture": "#0"}, - "south": {"uv": [7, 9, 8, 10], "texture": "#0"}, - "west": {"uv": [6, 5.5, 8.5, 6.5], "texture": "#0"}, - "up": {"uv": [1, 9, 0, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1, 9], "texture": "#0"} - } - }, - { - "from": [7.25, 5.89011, 14.78195], - "to": [8.75, 7.14011, 17.03195], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8.01511, 16.03195]}, - "faces": { - "north": {"uv": [10, 10, 11, 10.5], "texture": "#0"}, - "east": {"uv": [10.5, 0, 11.5, 0.5], "texture": "#0"}, - "south": {"uv": [10.5, 0.5, 11.5, 1], "texture": "#0"}, - "west": {"uv": [10.5, 1, 11.5, 1.5], "texture": "#0"}, - "up": {"uv": [10, 8, 9, 7], "texture": "#0"}, - "down": {"uv": [10.5, 0, 9.5, 1], "texture": "#0"} - } - }, - { - "from": [7.25, 4.5, 6.5], - "to": [8.75, 5.75, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [10.5, 1.5, 11.5, 2], "texture": "#0"}, - "east": {"uv": [8.5, 6, 10, 6.5], "texture": "#0"}, - "south": {"uv": [10.5, 2, 11.5, 2.5], "texture": "#0"}, - "west": {"uv": [9.5, 9, 11, 9.5], "texture": "#0"}, - "up": {"uv": [9, 8.5, 8, 7], "texture": "#0"}, - "down": {"uv": [3, 8.5, 2, 10], "texture": "#0"} - } - }, - { - "from": [7.25, 4.5, 11], - "to": [8.75, 5.75, 12.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 11]}, - "faces": { - "north": {"uv": [10.5, 2.5, 11.5, 3], "texture": "#0"}, - "east": {"uv": [10.5, 3, 11.5, 3.5], "texture": "#0"}, - "south": {"uv": [10.5, 3.5, 11.5, 4], "texture": "#0"}, - "west": {"uv": [10.5, 4, 11.5, 4.5], "texture": "#0"}, - "up": {"uv": [10.5, 2, 9.5, 1], "texture": "#0"}, - "down": {"uv": [9, 9.5, 8, 10.5], "texture": "#0"} - } - }, - { - "from": [7.25, 0.92388, 10.61732], - "to": [8.75, 4.42388, 12.36732], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5.42388, 10.61732]}, - "faces": { - "north": {"uv": [4, 6.5, 5, 8.5], "texture": "#0"}, - "east": {"uv": [6, 6.5, 7, 8.5], "texture": "#0"}, - "south": {"uv": [7, 0, 8, 2], "texture": "#0"}, - "west": {"uv": [7, 2, 8, 4], "texture": "#0"}, - "up": {"uv": [10.5, 9, 9.5, 8], "texture": "#0"}, - "down": {"uv": [10, 9.5, 9, 10.5], "texture": "#0"} - } - }, - { - "from": [7.25, 4.5, 9], - "to": [8.75, 4.75, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [8, 10.5, 9, 11], "texture": "#0"}, - "east": {"uv": [10.5, 8, 11.5, 8.5], "texture": "#0"}, - "south": {"uv": [10.5, 8.5, 11.5, 9], "texture": "#0"}, - "west": {"uv": [9, 10.5, 10, 11], "texture": "#0"}, - "up": {"uv": [1, 11, 0, 10], "texture": "#0"}, - "down": {"uv": [2.5, 10, 1.5, 11], "texture": "#0"} - } - }, - { - "from": [7.45, 0, 6.4], - "to": [8.55, 3.5, 8.65], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 2.75, 8.15]}, - "faces": { - "north": {"uv": [10, 2, 10.5, 4], "texture": "#0"}, - "east": {"uv": [7, 6.5, 8, 8.5], "texture": "#0"}, - "south": {"uv": [2.5, 10, 3, 12], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 2], "texture": "#0"}, - "up": {"uv": [2, 10, 1.5, 9], "texture": "#0"}, - "down": {"uv": [10.5, 10.5, 10, 11.5], "texture": "#0"} - } - }, - { - "from": [7.45, 3.25157, 6.64895], - "to": [8.55, 6.75157, 8.89895], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 6.00157, 8.39895]}, - "faces": { - "north": {"uv": [5, 10, 5.5, 12], "texture": "#0"}, - "east": {"uv": [8, 2, 9, 4], "texture": "#0"}, - "south": {"uv": [5.5, 10, 6, 12], "texture": "#0"}, - "west": {"uv": [5, 8, 6, 10], "texture": "#0"}, - "up": {"uv": [11, 11.5, 10.5, 10.5], "texture": "#0"}, - "down": {"uv": [0.5, 11, 0, 12], "texture": "#0"} - } - }, - { - "from": [7.5, 6.5, -8.1], - "to": [8.5, 7.5, -2.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 7.9]}, - "faces": { - "north": {"uv": [8, 9, 8.5, 9.5], "texture": "#0"}, - "east": {"uv": [8.5, 4.5, 11.5, 5], "texture": "#0"}, - "south": {"uv": [9, 8, 9.5, 8.5], "texture": "#0"}, - "west": {"uv": [8.5, 5, 11.5, 5.5], "texture": "#0"}, - "up": {"uv": [3.5, 11.5, 3, 8.5], "texture": "#0"}, - "down": {"uv": [4, 8.5, 3.5, 11.5], "texture": "#0"} - } - }, - { - "from": [7, 6, -3.7], - "to": [9, 8, 6.55], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 10.2]}, - "faces": { - "north": {"uv": [8, 9, 8.5, 9.5], "texture": "#0"}, - "east": {"uv": [8.5, 4.5, 11.5, 5], "texture": "#0"}, - "south": {"uv": [9, 8, 9.5, 8.5], "texture": "#0"}, - "west": {"uv": [8.5, 5, 11.5, 5.5], "texture": "#0"}, - "up": {"uv": [3.5, 11.5, 3, 8.5], "texture": "#0"}, - "down": {"uv": [4, 8.5, 3.5, 11.5], "texture": "#0"} - } - }, - { - "from": [7.5, 7.5, -4.8], - "to": [8.5, 9.5, -3.8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 2.7]}, - "faces": { - "north": {"uv": [0.5, 11, 1, 12], "texture": "#0"}, - "east": {"uv": [1, 11, 1.5, 12], "texture": "#0"}, - "south": {"uv": [1.5, 11, 2, 12], "texture": "#0"}, - "west": {"uv": [2, 11, 2.5, 12], "texture": "#0"}, - "up": {"uv": [8.5, 11.5, 8, 11], "texture": "#0"}, - "down": {"uv": [9, 11, 8.5, 11.5], "texture": "#0"} - } - }, - { - "from": [7.75, 7.5, 12.65], - "to": [8.25, 9.5, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 6.5]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 12], "texture": "#0"}, - "east": {"uv": [4.5, 11, 5, 12], "texture": "#0"}, - "south": {"uv": [11, 5.5, 11.5, 6.5], "texture": "#0"}, - "west": {"uv": [6, 11, 6.5, 12], "texture": "#0"}, - "up": {"uv": [9.5, 11.5, 9, 11], "texture": "#0"}, - "down": {"uv": [11.5, 9, 11, 9.5], "texture": "#0"} - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [-0.75, 1.5, -1.5], - "scale": [0.7, 0.7, 0.7] - }, - "thirdperson_lefthand": { - "scale": [0, 0, 0] - }, - "ground": { - "translation": [0, 5.5, 0], - "scale": [0.8, 0.8, 0.8] - }, - "head": { - "translation": [0, 12.5, -2.25] - }, - "fixed": { - "rotation": [90, -45, 90], - "translation": [-1.5, 1, 0], - "scale": [0.9, 0.9, 0.9] - } - }, - "groups": [ - { - "name": "m4", - "origin": [8, 7, 6.5], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/lod/hk_416.png b/src/main/resources/assets/superbwarfare/textures/item/lod/hk_416.png index 636c2f953efa70154997d99ee1ad5e143eacca01..5651d16c1704bc3709d02934750e73780dc686cc 100644 GIT binary patch literal 5245 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 Fe*mMSJ2e0R literal 359 zcmV-t0hs=YP)pZLcqU zLDzMYH8aB)0|2nr0s!v!Td|g>l8Lq;CubGZZdoKJ=kXno7nm6UX8XC8JjCZR6X2YS z7TTjz0C3R;T5GfRR?DmdDfa4sT7Z0dA{w?!@{Qu_+@GkxqarYJv1* ztp6iG^6A_`0&?F8Ndcck!AzxCkBOO3$1n%R=XjYi@{6H61?oYx7l#W-dLY-$KMRoV zotqGewKQkH_TI045l;k2ynhq`&@|2BXM2b{IXOA`mN!X}Z~Q){VcGxy002ovPDHLk FV1j>dmlOa1