From 227afb9e8cdb33b6ccc776045552d7fc3ffb718f Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Tue, 3 Jun 2025 13:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96MP5,QBZ,NTW=E7=9A=843p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/Qbz95ItemModel.java | 10 + .../client/renderer/gun/Mp5ItemRenderer.java | 25 +- .../client/renderer/gun/Ntw20Renderer.java | 51 +- .../renderer/gun/Qbz95ItemRenderer.java | 51 +- .../superbwarfare/geo/lod/qbz_95.geo.json | 2345 +++++++++++++++++ .../models/displaysettings/mp_5.item.json | 8 +- .../models/displaysettings/ntw_20.item.json | 10 +- .../models/displaysettings/qbz_95.item.json | 60 +- .../superbwarfare/models/lod/qbz_95.json | 259 -- .../textures/item/lod/qbz_95.png | Bin 341 -> 3863 bytes 10 files changed, 2483 insertions(+), 336 deletions(-) create mode 100644 src/main/resources/assets/superbwarfare/geo/lod/qbz_95.geo.json delete mode 100644 src/main/resources/assets/superbwarfare/models/lod/qbz_95.json diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java index 06bb70d80..76720c873 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Qbz95ItemModel.java @@ -45,6 +45,16 @@ public class Qbz95ItemModel extends CustomGunModel { return Mod.loc("textures/item/qbz_95.png"); } + @Override + public ResourceLocation getLODModelResource(Qbz95Item animatable) { + return Mod.loc("geo/lod/qbz_95.geo.json"); + } + + @Override + public ResourceLocation getLODTextureResource(Qbz95Item animatable) { + return Mod.loc("textures/item/lod/qbz_95.png"); + } + @Override public void setCustomAnimations(Qbz95Item animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java index 1b5db9589..1dc91ca93 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp5ItemRenderer.java @@ -49,11 +49,23 @@ public class Mp5ItemRenderer extends CustomGunRenderer { if (name.equals("bashou")) { bone.setHidden(!flag); } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (bone.getName().endsWith("_hide2"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); - } + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.05, 1, 0.35); ItemModelHelper.handleGunAttachments(bone, itemStack, name); + + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (bone.getName().endsWith("_hide2"))) { + 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.42, 14, 1, 255, 0, 0, 255, "dot", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.52, 14, 1.4f, 255, 0, 0, 255, "acog", true); + } + } } else { ItemModelHelper.hideAllAttachments(bone, name); if (name.equals("yugu")) { @@ -61,13 +73,6 @@ public class Mp5ItemRenderer extends CustomGunRenderer { } } - int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); - switch (scopeType) { - case 1 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.42, 14, 1, 255, 0, 0, 255, "dot", false); - case 2 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.52, 14, 1.4f, 255, 0, 0, 255, "acog", true); - } } else { ItemModelHelper.hideAllAttachments(bone, name); if (name.equals("yugu")) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java index 3b9f2a86f..50c9ccf4e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java @@ -41,38 +41,39 @@ public class Ntw20Renderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { if (name.equals("ironSight")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 0); } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 - && (name.equals("bone1") || name.equals("zhituiqi") || name.equals("guan") || name.equals("hidden"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); - } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 - && (name.equals("bone1") || name.equals("zhituiqi") || name.equals("guan") || name.equals("jing") || name.equals("rail") || name.equals("base2") || name.equals("guan7"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + + ItemModelHelper.handleGunAttachments(bone, itemStack, name); + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 3.70229375, 0.8); + + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 + && (name.equals("bone1") || name.equals("zhituiqi") || name.equals("guan") || name.equals("hidden"))) { + bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + } + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 + && (name.equals("bone1") || name.equals("zhituiqi") || name.equals("guan") || name.equals("jing") || name.equals("rail") || name.equals("base2") || name.equals("guan7"))) { + 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.468755, 40, 1, 255, 0, 0, 255, "eotech", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.48875, 9, 1, 255, 0, 0, 255, "acog", true); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.46875, 30, (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.468755, 40, 1, 255, 0, 0, 255, "eotech", false); - case 2 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.48875, 9, 1, 255, 0, 0, 255, "acog", true); - case 3 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.46875, 30, (float) ClientEventHandler.customZoom, 255, 0, 0, 255, "lpvo", true); - } - - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 3.70229375, 0.8); - ItemModelHelper.handleGunAttachments(bone, itemStack, name); } else { ItemModelHelper.hideAllAttachments(bone, name); - if (name.equals("hidden") || name.equals("jing") || name.equals("base2") || name.equals("guan7")) { - bone.setHidden(true); - } } if (renderingArms) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java index 95495b463..91409fbea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java @@ -41,9 +41,8 @@ public class Qbz95ItemRenderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); - // TODO 这里手上模型的渲染逻辑有问题 if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { if (name.equals("tiba")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 0); } @@ -53,29 +52,37 @@ public class Qbz95ItemRenderer extends CustomGunRenderer { if (name.equals("under_rail")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) == 0); } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 - && (name.equals("hidden"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + + ItemModelHelper.handleGunAttachments(bone, itemStack, name); + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.02, 1.12375, 0.3); + + 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("hidden2") || name.equals("jimiao2"))) { + 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.5363125, 16, 1, 255, 0, 0, 255, "dot", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.55, 24, 1, 255, 0, 0, 255, "dot", false); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.55, 36, 4, 255, 0, 0, 255, "sniper", true); + } } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 - && (name.equals("hidden2") || name.equals("jimiao2"))) { - bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); + + } else { + ItemModelHelper.hideAllAttachments(bone, name); + if (name.equals("under_rail") || name.equals("longbow")) { + bone.setHidden(true); } } - - int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); - - switch (scopeType) { - case 1 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.5363125, 16, 1, 255, 0, 0, 255, "dot", false); - case 2 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.55, 24, 1, 255, 0, 0, 255, "dot", false); - case 3 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.55, 36, 4, 255, 0, 0, 255, "sniper", true); - } - - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.02, 1.12375, 0.3); - ItemModelHelper.handleGunAttachments(bone, itemStack, name); } else { ItemModelHelper.hideAllAttachments(bone, name); if (name.equals("under_rail") || name.equals("longbow")) { diff --git a/src/main/resources/assets/superbwarfare/geo/lod/qbz_95.geo.json b/src/main/resources/assets/superbwarfare/geo/lod/qbz_95.geo.json new file mode 100644 index 000000000..ac6b8349d --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/lod/qbz_95.geo.json @@ -0,0 +1,2345 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.qbz_95", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 4, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [ + 0, + 0.75, + 0 + ] + }, + "bones": [ + { + "name": "group", + "pivot": [ + 0, + 1.26872, + 3.05596 + ], + "cubes": [ + { + "origin": [ + -1.0625, + 1.01512, + -12.04375 + ], + "size": [ + 2.125, + 1.825, + 28.875 + ], + "uv": { + "north": { + "uv": [ + 28, + 28 + ], + "uv_size": [ + 2, + 2 + ] + }, + "east": { + "uv": [ + 0, + 0 + ], + "uv_size": [ + 29, + 2 + ] + }, + "south": { + "uv": [ + 29, + 0 + ], + "uv_size": [ + 2, + 2 + ] + }, + "west": { + "uv": [ + 0, + 2 + ], + "uv_size": [ + 29, + 2 + ] + }, + "down": { + "uv": [ + 0, + 33 + ], + "uv_size": [ + 2, + -29 + ] + } + } + }, + { + "origin": [ + -0.7625, + 3.39012, + -12.04375 + ], + "size": [ + 1.525, + 0.95, + 28.875 + ], + "uv": { + "north": { + "uv": [ + 31, + 18 + ], + "uv_size": [ + 1.5, + 1.5 + ] + }, + "east": { + "uv": [ + 2, + 4 + ], + "uv_size": [ + 29, + 1.5 + ] + }, + "west": { + "uv": [ + 2, + 6 + ], + "uv_size": [ + 29, + 1.5 + ] + }, + "up": { + "uv": [ + 2, + 8 + ], + "uv_size": [ + 1.5, + 29 + ] + } + } + }, + { + "origin": [ + -0.7625, + 2.84012, + -12.04375 + ], + "size": [ + 1.525, + 0.55, + 0.25 + ], + "uv": { + "north": { + "uv": [ + 31, + 18 + ], + "uv_size": [ + 1.5, + 1.5 + ] + } + } + }, + { + "origin": [ + -0.1625, + 4.34012, + -1.54375 + ], + "size": [ + 0.325, + 1.35, + 0.875 + ], + "uv": { + "north": { + "uv": [ + 32, + 30 + ], + "uv_size": [ + 0.5, + 1.5 + ] + }, + "east": { + "uv": [ + 32, + 2 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "south": { + "uv": [ + 31, + 32 + ], + "uv_size": [ + 0.5, + 1.5 + ] + }, + "west": { + "uv": [ + 32, + 4 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "up": { + "uv": [ + 8, + 33 + ], + "uv_size": [ + 0.5, + 1 + ] + } + } + }, + { + "origin": [ + -1.15228, + 2.97449, + -12.04375 + ], + "size": [ + 0.83, + 0.26, + 28.875 + ], + "pivot": [ + -0.81228, + 3.10449, + 2.39375 + ], + "rotation": [ + 0, + 0, + -67.5 + ], + "uv": { + "north": { + "uv": [ + 33, + 5 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 4, + 8 + ], + "uv_size": [ + 1, + 29 + ] + } + } + }, + { + "origin": [ + 0.32228, + 2.97449, + -12.04375 + ], + "size": [ + 0.83, + 0.26, + 28.875 + ], + "pivot": [ + 0.81228, + 3.10449, + 2.39375 + ], + "rotation": [ + 0, + 0, + 67.5 + ], + "uv": { + "north": { + "uv": [ + 33, + 7 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 5, + 8 + ], + "uv_size": [ + 1, + 29 + ] + } + } + }, + { + "origin": [ + 0.50395, + 1.88633, + -11.79375 + ], + "size": [ + 0.84, + 0.26, + 2.125 + ], + "pivot": [ + 1.00395, + 2.01633, + 2.39375 + ], + "rotation": [ + 0, + 0, + 82 + ], + "uv": { + "north": { + "uv": [ + 33, + 9 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 12, + 22 + ], + "uv_size": [ + 1, + 8 + ] + } + } + }, + { + "origin": [ + -1.34395, + 1.88633, + -11.79375 + ], + "size": [ + 0.84, + 0.26, + 2.125 + ], + "pivot": [ + -1.00395, + 2.01633, + 2.39375 + ], + "rotation": [ + 0, + 0, + -82 + ], + "uv": { + "north": { + "uv": [ + 33, + 10 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 22, + 12 + ], + "uv_size": [ + 1, + 8 + ] + } + } + }, + { + "origin": [ + 0.51, + -0.97227, + -11.79375 + ], + "size": [ + 0.73, + 2.36, + 2.125 + ], + "pivot": [ + 1, + 1.20773, + 2.39375 + ], + "rotation": [ + 0, + 0, + 90 + ], + "uv": { + "north": { + "uv": [ + 20, + 32 + ], + "uv_size": [ + 0.5, + 2.5 + ] + }, + "west": { + "uv": [ + 6, + 8 + ], + "uv_size": [ + 8, + 2.5 + ] + }, + "up": { + "uv": [ + 18, + 29 + ], + "uv_size": [ + 0.5, + 8 + ] + }, + "down": { + "uv": [ + 19, + 37 + ], + "uv_size": [ + 0.5, + -8 + ] + } + } + }, + { + "origin": [ + 0.51, + -0.97227, + -9.66875 + ], + "size": [ + 0.73, + 2.36, + 2.125 + ], + "pivot": [ + 1, + 1.20773, + 4.51875 + ], + "rotation": [ + 0, + 0, + 90 + ], + "uv": { + "west": { + "uv": [ + 6, + 8 + ], + "uv_size": [ + 8, + 2.5 + ] + }, + "up": { + "uv": [ + 18, + 29 + ], + "uv_size": [ + 0.5, + 8 + ] + }, + "down": { + "uv": [ + 19, + 37 + ], + "uv_size": [ + 0.5, + -8 + ] + } + } + }, + { + "origin": [ + -1.34395, + 1.88633, + -9.66875 + ], + "size": [ + 0.84, + 0.26, + 2.125 + ], + "pivot": [ + -1.00395, + 2.01633, + 4.51875 + ], + "rotation": [ + 0, + 0, + -82 + ], + "uv": { + "up": { + "uv": [ + 22, + 12 + ], + "uv_size": [ + 1, + 8 + ] + } + } + }, + { + "origin": [ + 0.50395, + 1.88633, + -9.66875 + ], + "size": [ + 0.84, + 0.26, + 2.125 + ], + "pivot": [ + 1.00395, + 2.01633, + 4.51875 + ], + "rotation": [ + 0, + 0, + 82 + ], + "uv": { + "up": { + "uv": [ + 12, + 22 + ], + "uv_size": [ + 1, + 8 + ] + } + } + }, + { + "origin": [ + 0.51, + -0.97227, + -7.54375 + ], + "size": [ + 0.73, + 2.36, + 2.125 + ], + "pivot": [ + 1, + 1.20773, + 6.64375 + ], + "rotation": [ + 0, + 0, + 90 + ], + "uv": { + "south": { + "uv": [ + 21, + 32 + ], + "uv_size": [ + 0.5, + 2.5 + ] + }, + "west": { + "uv": [ + 6, + 8 + ], + "uv_size": [ + 8, + 2.5 + ] + }, + "up": { + "uv": [ + 18, + 29 + ], + "uv_size": [ + 0.5, + 8 + ] + }, + "down": { + "uv": [ + 19, + 37 + ], + "uv_size": [ + 0.5, + -8 + ] + } + } + }, + { + "origin": [ + 0.50395, + 1.88633, + -7.54375 + ], + "size": [ + 0.84, + 0.26, + 2.125 + ], + "pivot": [ + 1.00395, + 2.01633, + 6.64375 + ], + "rotation": [ + 0, + 0, + 82 + ], + "uv": { + "south": { + "uv": [ + 10, + 33 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 12, + 22 + ], + "uv_size": [ + 1, + 8 + ] + } + } + }, + { + "origin": [ + -1.34395, + 1.88633, + -7.54375 + ], + "size": [ + 0.84, + 0.26, + 2.125 + ], + "pivot": [ + -1.00395, + 2.01633, + 6.64375 + ], + "rotation": [ + 0, + 0, + -82 + ], + "uv": { + "south": { + "uv": [ + 11, + 33 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 22, + 12 + ], + "uv_size": [ + 1, + 8 + ] + } + } + }, + { + "origin": [ + -0.625, + 6.5694, + -3.28284 + ], + "size": [ + 1.25, + 0.7, + 10.1875 + ], + "pivot": [ + 0, + 6.9194, + 1.81091 + ], + "rotation": [ + 1.5, + 0, + 0 + ], + "uv": { + "east": { + "uv": [ + 26, + 26 + ], + "uv_size": [ + 10, + 0.5 + ] + }, + "west": { + "uv": [ + 26, + 27 + ], + "uv_size": [ + 10, + 0.5 + ] + }, + "up": { + "uv": [ + 14, + 8 + ], + "uv_size": [ + 1.5, + 10 + ] + } + } + }, + { + "origin": [ + -0.625, + 6.43618, + -2.47193 + ], + "size": [ + 1.25, + 0.28, + 8.3375 + ], + "uv": { + "east": { + "uv": [ + 28, + 11 + ], + "uv_size": [ + 8.5, + 0.5 + ] + }, + "west": { + "uv": [ + 28, + 25 + ], + "uv_size": [ + 8.5, + 0.5 + ] + }, + "down": { + "uv": [ + 18, + 28.5 + ], + "uv_size": [ + 1.5, + -8.5 + ] + } + } + }, + { + "origin": [ + -0.625, + 4.34747, + 7.81319 + ], + "size": [ + 1.25, + 3.3375, + 1.2 + ], + "pivot": [ + 0, + 2.21622, + 8.66319 + ], + "rotation": [ + 22.5, + 0, + 0 + ], + "uv": { + "north": { + "uv": [ + 22, + 24 + ], + "uv_size": [ + 1.5, + 3.5 + ] + }, + "east": { + "uv": [ + 6, + 30 + ], + "uv_size": [ + 1, + 3.5 + ] + }, + "south": { + "uv": [ + 24, + 24 + ], + "uv_size": [ + 1.5, + 3.5 + ] + }, + "west": { + "uv": [ + 7, + 30 + ], + "uv_size": [ + 1, + 3.5 + ] + } + } + }, + { + "origin": [ + -0.625, + 3.36512, + 5.79375 + ], + "size": [ + 1.25, + 3.3375, + 1.1 + ], + "uv": { + "north": { + "uv": [ + 26, + 18 + ], + "uv_size": [ + 1.5, + 3.5 + ] + }, + "east": { + "uv": [ + 12, + 30 + ], + "uv_size": [ + 1, + 3.5 + ] + }, + "south": { + "uv": [ + 26, + 22 + ], + "uv_size": [ + 1.5, + 3.5 + ] + }, + "west": { + "uv": [ + 15, + 30 + ], + "uv_size": [ + 1, + 3.5 + ] + } + } + }, + { + "origin": [ + -0.625, + 3.7713, + -2.59698 + ], + "size": [ + 1.25, + 3.0875, + 1.05 + ], + "pivot": [ + 0, + 8.74005, + -2.24698 + ], + "rotation": [ + -22.5, + 0, + 0 + ], + "uv": { + "north": { + "uv": [ + 10, + 28 + ], + "uv_size": [ + 1.5, + 3 + ] + }, + "east": { + "uv": [ + 30, + 18 + ], + "uv_size": [ + 1, + 3 + ] + }, + "south": { + "uv": [ + 28, + 18 + ], + "uv_size": [ + 1.5, + 3 + ] + }, + "west": { + "uv": [ + 22, + 30 + ], + "uv_size": [ + 1, + 3 + ] + } + } + }, + { + "origin": [ + -0.6875, + 4.34012, + -12.04375 + ], + "size": [ + 1.375, + 0.75, + 1.5 + ], + "uv": { + "north": { + "uv": [ + 31, + 7 + ], + "uv_size": [ + 1.5, + 1 + ] + }, + "east": { + "uv": [ + 31, + 22 + ], + "uv_size": [ + 1.5, + 1 + ] + }, + "south": { + "uv": [ + 31, + 23 + ], + "uv_size": [ + 1.5, + 1 + ] + }, + "west": { + "uv": [ + 31, + 24 + ], + "uv_size": [ + 1.5, + 1 + ] + }, + "up": { + "uv": [ + 31, + 0 + ], + "uv_size": [ + 1.5, + 1.5 + ] + } + } + }, + { + "origin": [ + -0.4875, + 4.77456, + -11.93017 + ], + "size": [ + 0.975, + 1.25, + 1.2 + ], + "pivot": [ + 0, + 5.14956, + -11.38017 + ], + "rotation": [ + 22.5, + 0, + 0 + ], + "uv": { + "north": { + "uv": [ + 27, + 31 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "east": { + "uv": [ + 28, + 31 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "south": { + "uv": [ + 31, + 28 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "west": { + "uv": [ + 29, + 31 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "up": { + "uv": [ + 15, + 26 + ], + "uv_size": [ + 1, + 1 + ] + } + } + }, + { + "origin": [ + -0.2375, + 5.74748, + -12.07315 + ], + "size": [ + 0.475, + 1.25, + 0.85 + ], + "uv": { + "north": { + "uv": [ + 26, + 32 + ], + "uv_size": [ + 0.5, + 1.5 + ] + }, + "east": { + "uv": [ + 30, + 31 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "south": { + "uv": [ + 32, + 28 + ], + "uv_size": [ + 0.5, + 1.5 + ] + }, + "west": { + "uv": [ + 31, + 30 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "up": { + "uv": [ + 33, + 0 + ], + "uv_size": [ + 0.5, + 1 + ] + } + } + }, + { + "origin": [ + -0.3, + 6.84748, + -12.12315 + ], + "size": [ + 0.6, + 0.6, + 0.95 + ], + "pivot": [ + 0, + 7.14748, + -11.64815 + ], + "rotation": [ + 0, + 0, + 45 + ], + "uv": { + "north": { + "uv": [ + 33, + 12 + ], + "uv_size": [ + 0.5, + 0.5 + ] + }, + "east": { + "uv": [ + 33, + 1 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "south": { + "uv": [ + 13, + 33 + ], + "uv_size": [ + 0.5, + 0.5 + ] + }, + "west": { + "uv": [ + 33, + 2 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "up": { + "uv": [ + 33, + 3 + ], + "uv_size": [ + 0.5, + 1 + ] + }, + "down": { + "uv": [ + 33, + 5 + ], + "uv_size": [ + 0.5, + -1 + ] + } + } + }, + { + "origin": [ + -1.0625, + -2.10988, + 16.83125 + ], + "size": [ + 2.125, + 6.625, + 2.625 + ], + "uv": { + "north": { + "uv": [ + 20, + 12 + ], + "uv_size": [ + 2, + 6.5 + ] + }, + "east": { + "uv": [ + 8, + 11 + ], + "uv_size": [ + 2.5, + 6.5 + ] + }, + "south": { + "uv": [ + 16, + 20 + ], + "uv_size": [ + 2, + 6.5 + ] + }, + "west": { + "uv": [ + 11, + 11 + ], + "uv_size": [ + 2.5, + 6.5 + ] + }, + "up": { + "uv": [ + 6, + 27 + ], + "uv_size": [ + 2, + 2.5 + ] + }, + "down": { + "uv": [ + 15, + 29.5 + ], + "uv_size": [ + 2, + -2.5 + ] + } + } + }, + { + "origin": [ + -1.0625, + 0.59015, + 2.05775 + ], + "size": [ + 2.125, + 1.375, + 2.35 + ], + "pivot": [ + 1.75, + 2.34015, + 0.38275 + ], + "rotation": [ + -15, + 0, + 0 + ], + "uv": { + "east": { + "uv": [ + 29, + 2 + ], + "uv_size": [ + 2.5, + 1.5 + ] + }, + "south": { + "uv": [ + 30, + 12 + ], + "uv_size": [ + 2, + 1.5 + ] + }, + "west": { + "uv": [ + 29, + 14 + ], + "uv_size": [ + 2.5, + 1.5 + ] + }, + "down": { + "uv": [ + 8, + 30.5 + ], + "uv_size": [ + 2, + -2.5 + ] + } + } + }, + { + "origin": [ + -1.0625, + 1.56494, + -2.4703 + ], + "size": [ + 2.125, + 0.825, + 2.275 + ], + "pivot": [ + 1.75, + 3.31494, + -4.2203 + ], + "rotation": [ + -22.5, + 0, + 0 + ], + "uv": { + "east": { + "uv": [ + 30, + 10 + ], + "uv_size": [ + 2.5, + 1 + ] + }, + "west": { + "uv": [ + 27, + 30 + ], + "uv_size": [ + 2.5, + 1 + ] + }, + "down": { + "uv": [ + 28, + 10.5 + ], + "uv_size": [ + 2, + -2.5 + ] + } + } + }, + { + "origin": [ + -1.0625, + 0.15783, + -1.17138 + ], + "size": [ + 2.125, + 1.575, + 2.975 + ], + "uv": { + "east": { + "uv": [ + 28, + 21 + ], + "uv_size": [ + 3, + 1.5 + ] + }, + "west": { + "uv": [ + 22, + 28 + ], + "uv_size": [ + 3, + 1.5 + ] + }, + "down": { + "uv": [ + 23, + 17 + ], + "uv_size": [ + 2, + -3 + ] + } + } + }, + { + "origin": [ + -0.4375, + -1.61717, + -0.69639 + ], + "size": [ + 0.875, + 0.275, + 2.7 + ], + "uv": { + "east": { + "uv": [ + 32, + 17 + ], + "uv_size": [ + 2.5, + 0.5 + ] + }, + "west": { + "uv": [ + 23, + 32 + ], + "uv_size": [ + 2.5, + 0.5 + ] + }, + "up": { + "uv": [ + 30, + 28 + ], + "uv_size": [ + 1, + 2.5 + ] + }, + "down": { + "uv": [ + 31, + 6.5 + ], + "uv_size": [ + 1, + -2.5 + ] + } + } + }, + { + "origin": [ + -0.4375, + -1.40995, + -1.19665 + ], + "size": [ + 0.875, + 0.275, + 0.7 + ], + "pivot": [ + 0, + -1.27245, + -0.84665 + ], + "rotation": [ + -45, + 0, + 0 + ], + "uv": { + "east": { + "uv": [ + 33, + 13 + ], + "uv_size": [ + 0.5, + 0.5 + ] + }, + "west": { + "uv": [ + 14, + 33 + ], + "uv_size": [ + 0.5, + 0.5 + ] + }, + "up": { + "uv": [ + 33, + 8 + ], + "uv_size": [ + 1, + 0.5 + ] + }, + "down": { + "uv": [ + 9, + 33.5 + ], + "uv_size": [ + 1, + -0.5 + ] + } + } + }, + { + "origin": [ + -0.4375, + -0.90969, + -2.15386 + ], + "size": [ + 0.875, + 0.275, + 1.45 + ], + "pivot": [ + 0, + -0.77219, + -1.05386 + ], + "rotation": [ + -90, + 0, + 0 + ], + "uv": { + "east": { + "uv": [ + 32, + 32 + ], + "uv_size": [ + 1.5, + 0.5 + ] + }, + "west": { + "uv": [ + 0, + 33 + ], + "uv_size": [ + 1.5, + 0.5 + ] + }, + "up": { + "uv": [ + 32, + 12 + ], + "uv_size": [ + 1, + 1.5 + ] + }, + "down": { + "uv": [ + 32, + 15.5 + ], + "uv_size": [ + 1, + -1.5 + ] + } + } + }, + { + "origin": [ + -1.0625, + -0.39197, + 3.81767 + ], + "size": [ + 2.125, + 1.425, + 3.25 + ], + "uv": { + "east": { + "uv": [ + 28, + 23 + ], + "uv_size": [ + 3, + 1.5 + ] + }, + "south": { + "uv": [ + 23, + 30 + ], + "uv_size": [ + 2, + 1.5 + ] + }, + "west": { + "uv": [ + 25, + 28 + ], + "uv_size": [ + 3, + 1.5 + ] + }, + "down": { + "uv": [ + 23, + 20 + ], + "uv_size": [ + 2, + -3 + ] + } + } + }, + { + "origin": [ + -0.9125, + -0.39197, + 7.06767 + ], + "size": [ + 1.825, + 1.425, + 9.75 + ], + "uv": { + "east": { + "uv": [ + 16, + 8 + ], + "uv_size": [ + 10, + 1.5 + ] + }, + "west": { + "uv": [ + 16, + 10 + ], + "uv_size": [ + 10, + 1.5 + ] + }, + "down": { + "uv": [ + 6, + 21 + ], + "uv_size": [ + 2, + -10 + ] + } + } + }, + { + "origin": [ + -0.8125, + -1.76697, + 14.36767 + ], + "size": [ + 1.625, + 1.375, + 2.45 + ], + "uv": { + "east": { + "uv": [ + 29, + 16 + ], + "uv_size": [ + 2.5, + 1.5 + ] + }, + "west": { + "uv": [ + 30, + 8 + ], + "uv_size": [ + 2.5, + 1.5 + ] + }, + "down": { + "uv": [ + 20, + 31.5 + ], + "uv_size": [ + 1.5, + -2.5 + ] + } + } + }, + { + "origin": [ + -0.8125, + -1.05667, + 13.75321 + ], + "size": [ + 1.625, + 0.825, + 1.7 + ], + "pivot": [ + 0, + -0.36917, + 14.22821 + ], + "rotation": [ + -55, + 0, + 0 + ], + "uv": { + "east": { + "uv": [ + 32, + 6 + ], + "uv_size": [ + 1.5, + 1 + ] + }, + "west": { + "uv": [ + 32, + 16 + ], + "uv_size": [ + 1.5, + 1 + ] + }, + "down": { + "uv": [ + 31, + 21.5 + ], + "uv_size": [ + 1.5, + -1.5 + ] + } + } + }, + { + "origin": [ + -0.55, + -2.51697, + 8.56767 + ], + "size": [ + 1.1, + 2.125, + 3.4375 + ], + "uv": { + "north": { + "uv": [ + 25, + 18 + ], + "uv_size": [ + 1, + 2 + ] + }, + "east": { + "uv": [ + 22, + 20 + ], + "uv_size": [ + 3.5, + 2 + ] + }, + "south": { + "uv": [ + 17, + 31 + ], + "uv_size": [ + 1, + 2 + ] + }, + "west": { + "uv": [ + 22, + 22 + ], + "uv_size": [ + 3.5, + 2 + ] + } + } + }, + { + "origin": [ + -0.55, + -5.58675, + 7.95705 + ], + "size": [ + 1.1, + 3.875, + 3.4375 + ], + "pivot": [ + 0, + -3.64925, + 9.6758 + ], + "rotation": [ + -22.5, + 0, + 0 + ], + "uv": { + "north": { + "uv": [ + 15, + 22 + ], + "uv_size": [ + 1, + 4 + ] + }, + "east": { + "uv": [ + 16, + 12 + ], + "uv_size": [ + 3.5, + 4 + ] + }, + "south": { + "uv": [ + 17, + 27 + ], + "uv_size": [ + 1, + 4 + ] + }, + "west": { + "uv": [ + 16, + 16 + ], + "uv_size": [ + 3.5, + 4 + ] + } + } + }, + { + "origin": [ + -0.55, + -8.18918, + 6.21816 + ], + "size": [ + 1.1, + 3.875, + 3.4375 + ], + "pivot": [ + 0, + -6.25168, + 7.93691 + ], + "rotation": [ + -45, + 0, + 0 + ], + "uv": { + "north": { + "uv": [ + 13, + 29 + ], + "uv_size": [ + 1, + 4 + ] + }, + "east": { + "uv": [ + 8, + 18 + ], + "uv_size": [ + 3.5, + 4 + ] + }, + "south": { + "uv": [ + 14, + 29 + ], + "uv_size": [ + 1, + 4 + ] + }, + "west": { + "uv": [ + 12, + 18 + ], + "uv_size": [ + 3.5, + 4 + ] + }, + "down": { + "uv": [ + 16, + 33.5 + ], + "uv_size": [ + 1, + -3.5 + ] + } + } + }, + { + "origin": [ + -0.7125, + -4.56922, + 2.14911 + ], + "size": [ + 1.425, + 5.325, + 2.025 + ], + "pivot": [ + 0, + -1.90672, + 3.16161 + ], + "rotation": [ + 17.5, + 0, + 0 + ], + "uv": { + "north": { + "uv": [ + 8, + 22 + ], + "uv_size": [ + 1.5, + 5.5 + ] + }, + "east": { + "uv": [ + 20, + 19 + ], + "uv_size": [ + 2, + 5.5 + ] + }, + "south": { + "uv": [ + 10, + 22 + ], + "uv_size": [ + 1.5, + 5.5 + ] + }, + "west": { + "uv": [ + 6, + 21 + ], + "uv_size": [ + 2, + 5.5 + ] + }, + "down": { + "uv": [ + 25, + 32 + ], + "uv_size": [ + 1.5, + -2 + ] + } + } + }, + { + "origin": [ + -0.50625, + 1.82137, + -19.04375 + ], + "size": [ + 1.0125, + 1.0125, + 7 + ], + "pivot": [ + 0, + 2.32762, + -19.04375 + ], + "rotation": [ + 0, + 0, + 45 + ], + "uv": { + "east": { + "uv": [ + 23, + 12 + ], + "uv_size": [ + 7, + 1 + ] + }, + "west": { + "uv": [ + 23, + 13 + ], + "uv_size": [ + 7, + 1 + ] + }, + "up": { + "uv": [ + 13, + 22 + ], + "uv_size": [ + 1, + 7 + ] + }, + "down": { + "uv": [ + 14, + 29 + ], + "uv_size": [ + 1, + -7 + ] + } + } + }, + { + "origin": [ + -0.75, + 1.57762, + -22.54375 + ], + "size": [ + 1.5, + 1.5, + 3.5 + ], + "pivot": [ + 0, + 2.32762, + -16.94375 + ], + "rotation": [ + 0, + 0, + 45 + ], + "uv": { + "north": { + "uv": [ + 8, + 31 + ], + "uv_size": [ + 1.5, + 1.5 + ] + }, + "east": { + "uv": [ + 25, + 14 + ], + "uv_size": [ + 3.5, + 1.5 + ] + }, + "south": { + "uv": [ + 10, + 31 + ], + "uv_size": [ + 1.5, + 1.5 + ] + }, + "west": { + "uv": [ + 25, + 16 + ], + "uv_size": [ + 3.5, + 1.5 + ] + }, + "up": { + "uv": [ + 20, + 25 + ], + "uv_size": [ + 1.5, + 3.5 + ] + }, + "down": { + "uv": [ + 26, + 11.5 + ], + "uv_size": [ + 1.5, + -3.5 + ] + } + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/mp_5.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/mp_5.item.json index ba37db06d..bd1631ed3 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/mp_5.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/mp_5.item.json @@ -28,13 +28,13 @@ "thirdperson_righthand": { "translation": [ -1.25, - -0.5, + -1.5, -0.75 ], "scale": [ - 0.6, - 0.6, - 0.6 + 0.5, + 0.5, + 0.5 ] }, "thirdperson_lefthand": { diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/ntw_20.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/ntw_20.item.json index 5b1dab583..79a9269db 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/ntw_20.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/ntw_20.item.json @@ -33,13 +33,13 @@ "thirdperson_righthand": { "translation": [ -0.75, - 0, - 1 + -1, + -1.25 ], "scale": [ - 0.45, - 0.45, - 0.45 + 0.6, + 0.6, + 0.6 ] }, "thirdperson_lefthand": { diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/qbz_95.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/qbz_95.item.json index 8019cec57..dc6662be5 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/qbz_95.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/qbz_95.item.json @@ -21,21 +21,59 @@ 0 ] }, - "gui": { - "rotation": [ - 165.69, - -39.63, - 178.66 - ], + "thirdperson_righthand": { "translation": [ - -1.9, - -3.25, + -1.75, + -1.75, 0 ], "scale": [ - 0.18, - 0.18, - 0.18 + 0.55, + 0.55, + 0.55 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 3.5, + 0 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "head": { + "translation": [ + 0, + 6.25, + -0.5 + ] + }, + "fixed": { + "rotation": [ + 0, + -90, + 0 + ], + "translation": [ + 0.75, + -0.75, + -0.75 + ], + "scale": [ + 1.1, + 1.1, + 1.1 ] } } diff --git a/src/main/resources/assets/superbwarfare/models/lod/qbz_95.json b/src/main/resources/assets/superbwarfare/models/lod/qbz_95.json deleted file mode 100644 index eb892f278..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/qbz_95.json +++ /dev/null @@ -1,259 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/lod/qbz_95", - "particle": "superbwarfare:item/lod/qbz_95" - }, - "elements": [ - { - "from": [6.25, 1, 2], - "to": [7.75, 2.9, 18.5], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 3]}, - "faces": { - "north": {"uv": [6.5, 7, 7.5, 8], "texture": "#0"}, - "east": {"uv": [0, 0, 8.5, 1], "texture": "#0"}, - "south": {"uv": [3, 7.5, 4, 8.5], "texture": "#0"}, - "west": {"uv": [0, 1, 8.5, 2], "texture": "#0"}, - "up": {"uv": [1, 10.5, 0, 2], "texture": "#0"}, - "down": {"uv": [2, 2, 1, 10.5], "texture": "#0"} - } - }, - { - "from": [6.5, 4.25, 7], - "to": [7.5, 4.65, 12.25], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 4.45, 10.125]}, - "faces": { - "north": {"uv": [9.5, 5, 10, 5.5], "texture": "#0"}, - "east": {"uv": [2, 6.5, 5, 7], "texture": "#0"}, - "south": {"uv": [8.5, 9.5, 9, 10], "texture": "#0"}, - "west": {"uv": [5, 6.5, 8, 7], "texture": "#0"}, - "up": {"uv": [2.5, 10, 2, 7], "texture": "#0"}, - "down": {"uv": [3, 7, 2.5, 10], "texture": "#0"} - } - }, - { - "from": [6.5, 2.76134, 13.06111], - "to": [7.5, 4.81134, 13.46111], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7, 1.68634, 13.26111]}, - "faces": { - "north": {"uv": [8, 6, 8.5, 7], "texture": "#0"}, - "east": {"uv": [8.5, 3, 9, 4], "texture": "#0"}, - "south": {"uv": [3.5, 8.5, 4, 9.5], "texture": "#0"}, - "west": {"uv": [4, 8.5, 4.5, 9.5], "texture": "#0"}, - "up": {"uv": [9.5, 10, 9, 9.5], "texture": "#0"}, - "down": {"uv": [10, 9, 9.5, 9.5], "texture": "#0"} - } - }, - { - "from": [6.5, 2.44163, 7.39616], - "to": [7.5, 4.49163, 7.79616], - "rotation": {"angle": 22.5, "axis": "x", "origin": [7, 5.56663, 7.59616]}, - "faces": { - "north": {"uv": [8.5, 4, 9, 5], "texture": "#0"}, - "east": {"uv": [4.5, 8.5, 5, 9.5], "texture": "#0"}, - "south": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"}, - "west": {"uv": [8.5, 5, 9, 6], "texture": "#0"}, - "up": {"uv": [10, 10, 9.5, 9.5], "texture": "#0"}, - "down": {"uv": [10.5, 0, 10, 0.5], "texture": "#0"} - } - }, - { - "from": [6.75, 2.9, 2], - "to": [7.25, 3.9, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 2]}, - "faces": { - "north": {"uv": [10, 0.5, 10.5, 1], "texture": "#0"}, - "east": {"uv": [10, 1, 10.5, 1.5], "texture": "#0"}, - "south": {"uv": [2, 10, 2.5, 10.5], "texture": "#0"}, - "west": {"uv": [10, 2, 10.5, 2.5], "texture": "#0"}, - "up": {"uv": [3, 10.5, 2.5, 10], "texture": "#0"}, - "down": {"uv": [10.5, 2.5, 10, 3], "texture": "#0"} - } - }, - { - "from": [6.25, -0.5, 18.5], - "to": [7.75, 3, 20], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 2, 3]}, - "faces": { - "north": {"uv": [4, 2, 5, 4], "texture": "#0"}, - "east": {"uv": [4, 4, 5, 6], "texture": "#0"}, - "south": {"uv": [5, 2, 6, 4], "texture": "#0"}, - "west": {"uv": [5, 4, 6, 6], "texture": "#0"}, - "up": {"uv": [8.5, 4, 7.5, 3], "texture": "#0"}, - "down": {"uv": [5, 7.5, 4, 8.5], "texture": "#0"} - } - }, - { - "from": [6.25, 1, 10.05], - "to": [7.75, 1.9, 11.05], - "rotation": {"angle": 22.5, "axis": "x", "origin": [6, 2, 8.75]}, - "faces": { - "north": {"uv": [7, 6, 8, 6.5], "texture": "#0"}, - "east": {"uv": [3, 10, 3.5, 10.5], "texture": "#0"}, - "south": {"uv": [8.5, 1.5, 9.5, 2], "texture": "#0"}, - "west": {"uv": [10, 3, 10.5, 3.5], "texture": "#0"}, - "up": {"uv": [9.5, 6.5, 8.5, 6], "texture": "#0"}, - "down": {"uv": [9.5, 6.5, 8.5, 7], "texture": "#0"} - } - }, - { - "from": [6.25, 1.31418, 7.47054], - "to": [7.75, 2.21418, 8.77054], - "rotation": {"angle": 22.5, "axis": "x", "origin": [6, 2.31418, 6.47054]}, - "faces": { - "north": {"uv": [8.5, 7, 9.5, 7.5], "texture": "#0"}, - "east": {"uv": [3.5, 10, 4, 10.5], "texture": "#0"}, - "south": {"uv": [8.5, 7.5, 9.5, 8], "texture": "#0"}, - "west": {"uv": [10, 3.5, 10.5, 4], "texture": "#0"}, - "up": {"uv": [9.5, 8.5, 8.5, 8], "texture": "#0"}, - "down": {"uv": [9.5, 8.5, 8.5, 9], "texture": "#0"} - } - }, - { - "from": [6.25, 0.51012, 8.21278], - "to": [7.75, 1.41012, 9.91278], - "rotation": {"angle": 0, "axis": "x", "origin": [6, 1.51012, 7.61278]}, - "faces": { - "north": {"uv": [9, 0, 10, 0.5], "texture": "#0"}, - "east": {"uv": [9, 0.5, 10, 1], "texture": "#0"}, - "south": {"uv": [9, 1, 10, 1.5], "texture": "#0"}, - "west": {"uv": [9, 3, 10, 3.5], "texture": "#0"}, - "up": {"uv": [8.5, 5, 7.5, 4], "texture": "#0"}, - "down": {"uv": [6, 7.5, 5, 8.5], "texture": "#0"} - } - }, - { - "from": [6.75, -0.38988, 8.91278], - "to": [7.25, -0.28988, 11.11278], - "rotation": {"angle": 0, "axis": "x", "origin": [6, 0.11012, 8.81278]}, - "faces": { - "north": {"uv": [4, 10, 4.5, 10.5], "texture": "#0"}, - "east": {"uv": [9, 3.5, 10, 4], "texture": "#0"}, - "south": {"uv": [10, 4, 10.5, 4.5], "texture": "#0"}, - "west": {"uv": [9, 4, 10, 4.5], "texture": "#0"}, - "up": {"uv": [6, 9.5, 5.5, 8.5], "texture": "#0"}, - "down": {"uv": [9.5, 4.5, 9, 5.5], "texture": "#0"} - } - }, - { - "from": [6.75, -0.28988, 8.91278], - "to": [7.25, 0.61012, 9.01278], - "rotation": {"angle": 0, "axis": "x", "origin": [6, -0.38988, 8.51278]}, - "faces": { - "north": {"uv": [4.5, 10, 5, 10.5], "texture": "#0"}, - "east": {"uv": [5, 10, 5.5, 10.5], "texture": "#0"}, - "south": {"uv": [10, 5, 10.5, 5.5], "texture": "#0"}, - "west": {"uv": [10, 5.5, 10.5, 6], "texture": "#0"}, - "up": {"uv": [6.5, 10.5, 6, 10], "texture": "#0"}, - "down": {"uv": [10.5, 6, 10, 6.5], "texture": "#0"} - } - }, - { - "from": [6.25, 0.19595, 10.49224], - "to": [7.75, 1.09595, 18.49224], - "rotation": {"angle": 0, "axis": "x", "origin": [6, 1.19595, 10.49224]}, - "faces": { - "north": {"uv": [9, 5.5, 10, 6], "texture": "#0"}, - "east": {"uv": [2, 6, 6, 6.5], "texture": "#0"}, - "south": {"uv": [8.5, 9, 9.5, 9.5], "texture": "#0"}, - "west": {"uv": [6, 2, 10, 2.5], "texture": "#0"}, - "up": {"uv": [3, 6, 2, 2], "texture": "#0"}, - "down": {"uv": [4, 2, 3, 6], "texture": "#0"} - } - }, - { - "from": [6.25, -0.30405, 17.09224], - "to": [7.75, 0.19595, 18.49224], - "rotation": {"angle": 0, "axis": "x", "origin": [6, 1.19595, 10.49224]}, - "faces": { - "north": {"uv": [9.5, 1.5, 10.5, 2], "texture": "#0"}, - "east": {"uv": [6.5, 10, 7, 10.5], "texture": "#0"}, - "south": {"uv": [3.5, 9.5, 4.5, 10], "texture": "#0"}, - "west": {"uv": [10, 6.5, 10.5, 7], "texture": "#0"}, - "up": {"uv": [5.5, 10, 4.5, 9.5], "texture": "#0"}, - "down": {"uv": [10.5, 4.5, 9.5, 5], "texture": "#0"} - } - }, - { - "from": [6.6, -1.30405, 14.49224], - "to": [7.4, 0.19595, 16.74224], - "rotation": {"angle": 0, "axis": "x", "origin": [6, 1.19595, 10.49224]}, - "faces": { - "north": {"uv": [5.5, 9.5, 6, 10.5], "texture": "#0"}, - "east": {"uv": [7.5, 5, 8.5, 6], "texture": "#0"}, - "south": {"uv": [9.5, 6, 10, 7], "texture": "#0"}, - "west": {"uv": [7.5, 7, 8.5, 8], "texture": "#0"}, - "up": {"uv": [10, 8, 9.5, 7], "texture": "#0"}, - "down": {"uv": [8, 9.5, 7.5, 10.5], "texture": "#0"} - } - }, - { - "from": [6.6, -2.4884, 15.35068], - "to": [7.4, 1.0116, 17.60068], - "rotation": {"angle": 22.5, "axis": "x", "origin": [6, 2.0116, 11.35068]}, - "faces": { - "north": {"uv": [6.5, 8, 7, 10], "texture": "#0"}, - "east": {"uv": [6, 2.5, 7, 4.5], "texture": "#0"}, - "south": {"uv": [7, 8, 7.5, 10], "texture": "#0"}, - "west": {"uv": [6, 4.5, 7, 6.5], "texture": "#0"}, - "up": {"uv": [8.5, 10.5, 8, 9.5], "texture": "#0"}, - "down": {"uv": [10, 8, 9.5, 9], "texture": "#0"} - } - }, - { - "from": [6.45, -2.78778, 11.03665], - "to": [7.55, 0.11222, 12.33665], - "rotation": {"angle": -22.5, "axis": "x", "origin": [6.25, -0.71166, 10.65397]}, - "faces": { - "north": {"uv": [7.5, 8, 8, 9.5], "texture": "#0"}, - "east": {"uv": [8, 8, 8.5, 9.5], "texture": "#0"}, - "south": {"uv": [8.5, 0, 9, 1.5], "texture": "#0"}, - "west": {"uv": [3, 8.5, 3.5, 10], "texture": "#0"}, - "up": {"uv": [7.5, 10.5, 7, 10], "texture": "#0"}, - "down": {"uv": [10.5, 7, 10, 7.5], "texture": "#0"} - } - }, - { - "from": [6.5, 1.25, -4], - "to": [7.5, 2.25, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 1.75, 0.5]}, - "faces": { - "north": {"uv": [10, 7.5, 10.5, 8], "texture": "#0"}, - "east": {"uv": [7, 2.5, 10, 3], "texture": "#0"}, - "south": {"uv": [10, 8, 10.5, 8.5], "texture": "#0"}, - "west": {"uv": [3, 7, 6, 7.5], "texture": "#0"}, - "up": {"uv": [7.5, 6, 7, 3], "texture": "#0"}, - "down": {"uv": [6.5, 7, 6, 10], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [-0.5, 6.25, -1.75], - "scale": [0.8, 0.8, 0.8] - }, - "thirdperson_lefthand": { - "translation": [-0.5, 6.25, -1.75], - "scale": [0.8, 0.8, 0.8] - }, - "ground": { - "translation": [0, 8.75, 0] - }, - "head": { - "translation": [0, 13.5, -0.5] - }, - "fixed": { - "rotation": [90, 45, -90], - "translation": [4.25, 5.25, -1.25] - } - }, - "groups": [ - { - "name": "group", - "origin": [7, 1.75, -2.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/qbz_95.png b/src/main/resources/assets/superbwarfare/textures/item/lod/qbz_95.png index 388b314cac7c875d7c6bbe9f77b0da5fab176434..dd5e6633c653ca2a87dbab081c104666ae4945dd 100644 GIT binary patch literal 3863 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 Wb_yiks$KR^7qCEKOd5<`6aEizmQ2t9 literal 341 zcmV-b0jmCqP)z^ zCICQkYH_}oYHI+my$>;xQjLiS>$+ZYd@A4!?Xc7fwLDt|+{G;dTBAox35Y25!4~TY zz|{=IlMv^E_ukx$f8GNhC5TZu=dyJv