diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index 3dbae7060..d811840b5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -192,7 +192,7 @@ public class AnimationHelper { ResourceLocation tex = Mod.loc("textures/crosshair/" + name + ".png"); - int alpha = hasBlackPart ? a : (int) (0.05 * a); + int alpha = hasBlackPart ? a : (int) (0.12 * a); VertexConsumer blackPart = buffer.getBuffer(RenderType.entityTranslucent(tex)); vertexRGB(blackPart, $$7, pose, packedLightIn, 0.0F, 0, 0, 1, r, g, b, alpha, size); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java deleted file mode 100644 index 261a1bbfe..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Mk14Layer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.atsuishio.superbwarfare.client.layer.gun; - -import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.rifle.Mk14Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.cache.object.BakedGeoModel; -import software.bernie.geckolib.renderer.GeoRenderer; -import software.bernie.geckolib.renderer.layer.GeoRenderLayer; - -public class Mk14Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = Mod.loc("textures/item/mk14_e.png"); - - public Mk14Layer(GeoRenderer entityRenderer) { - super(entityRenderer); - } - - @Override - public void render(PoseStack poseStack, Mk14Item animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { - RenderType glowRenderType = RenderType.eyes(LAYER); - getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java deleted file mode 100644 index 5080b9de2..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Qbz95Layer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.atsuishio.superbwarfare.client.layer.gun; - -import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.rifle.Qbz95Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.cache.object.BakedGeoModel; -import software.bernie.geckolib.renderer.GeoRenderer; -import software.bernie.geckolib.renderer.layer.GeoRenderLayer; - -public class Qbz95Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = Mod.loc("textures/item/qbz95_e.png"); - - public Qbz95Layer(GeoRenderer entityRenderer) { - super(entityRenderer); - } - - @Override - public void render(PoseStack poseStack, Qbz95Item animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { - RenderType glowRenderType = RenderType.eyes(LAYER); - getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java deleted file mode 100644 index d01044e63..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/RpkLayer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.atsuishio.superbwarfare.client.layer.gun; - -import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.machinegun.RpkItem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.cache.object.BakedGeoModel; -import software.bernie.geckolib.renderer.GeoRenderer; -import software.bernie.geckolib.renderer.layer.GeoRenderLayer; - -public class RpkLayer extends GeoRenderLayer { - private static final ResourceLocation LAYER = Mod.loc("textures/item/rpk_e.png"); - - public RpkLayer(GeoRenderer entityRenderer) { - super(entityRenderer); - } - - @Override - public void render(PoseStack poseStack, RpkItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { - RenderType glowRenderType = RenderType.eyes(LAYER); - getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF); - } -} 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 931813fc8..1d4d54c24 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 @@ -54,9 +54,6 @@ public class Qbz95ItemModel extends GeoModel { GeoBone button = getAnimationProcessor().getBone("button"); GeoBone button3 = getAnimationProcessor().getBone("button3"); GeoBone button6 = getAnimationProcessor().getBone("button6"); - GeoBone cross1 = getAnimationProcessor().getBone("Cross1"); - GeoBone cross2 = getAnimationProcessor().getBone("Cross2"); - GeoBone cross3 = getAnimationProcessor().getBone("Cross3"); GeoBone camera = getAnimationProcessor().getBone("camera"); GeoBone main = getAnimationProcessor().getBone("0"); @@ -145,13 +142,8 @@ public class Qbz95ItemModel extends GeoModel { shen.setRotZ((float) (shen.getRotZ() * (1 - 0.4 * zt))); CrossHairOverlay.gunRot = shen.getRotZ(); - bolt.setPosZ(5f * (float) fp); - cross1.setPosY(-0.75f * (float) fpz); - cross2.setPosY(-0.7f * (float) fpz); - cross3.setPosY(-0.2f * (float) fpz); - GeoBone l = getAnimationProcessor().getBone("l"); GeoBone r = getAnimationProcessor().getBone("r"); rotXBipod = Mth.lerp(1.5f * times, rotXBipod, isProne(player) ? -90 : 0); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java index a2e07976b..90cce8179 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/RpkItemModel.java @@ -78,14 +78,14 @@ public class RpkItemModel extends GeoModel { float scaleZ = switch (type) { case 0, 1 -> 0.7f; case 2 -> 0.74f; - case 3 -> 0.78f; + case 3 -> 0.8f; default -> 0f; }; float posZ = switch (type) { case 0 -> 3.3f; case 1 -> 4.2f; case 2 -> 4.4f; - case 3 -> 4.25f; + case 3 -> 4.6f; default -> 0f; }; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java index a772989c9..513250cea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java @@ -27,8 +27,6 @@ public class Mk14ItemRenderer extends GeoItemRenderer { public Mk14ItemRenderer() { super(new Mk14ItemModel()); - // TODO layer -// this.addRenderLayer(new Mk14Layer(this)); } @Override @@ -80,24 +78,11 @@ public class Mk14ItemRenderer extends GeoItemRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - var data = GunData.from(itemStack); if (name.equals("qiaojia")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 0); } - if (name.equals("Cross1")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 1); - } - - if (name.equals("Cross2")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 2); - } - - if (name.equals("Cross3")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 3); - } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (name.equals("hidden"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); @@ -108,6 +93,17 @@ public class Mk14ItemRenderer extends GeoItemRenderer { 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, packedLightIn, 0, 0.25, 30, 0.8f, 255, 0, 0, 255, "eotech", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.313, 9, 1, 255, 0, 0, 255, "acog", true); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.29, 45, (float) ClientEventHandler.customZoom, 255, 0, 0, 255, "lpvo", true); + } + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.475, 0.33); ItemModelHelper.handleGunAttachments(bone, itemStack, name); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index 29b0041be..552659d26 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -27,8 +27,6 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { public Qbz95ItemRenderer() { super(new Qbz95ItemModel()); - // TODO layer -// this.addRenderLayer(new Qbz95Layer(this)); } @Override @@ -82,10 +80,6 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { if (!(itemStack.getItem() instanceof GunItem)) return; var data = GunData.from(itemStack); - if (name.equals("Cross1")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 1); - } - if (name.equals("tiba")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 0); } @@ -98,14 +92,6 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) == 0); } - if (name.equals("Cross2")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 2); - } - - if (name.equals("Cross3")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 3); - } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (name.equals("hidden"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); @@ -116,6 +102,17 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { 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, packedLightIn, 0, 0.5363125, 16, 1, 255, 0, 0, 255, "dot", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.55, 24, 1, 255, 0, 0, 255, "dot", false); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.55, 36, (float) ClientEventHandler.customZoom, 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); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java index 7eeeac1c6..3c009dbff 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java @@ -27,8 +27,6 @@ public class RpkItemRenderer extends GeoItemRenderer { public RpkItemRenderer() { super(new RpkItemModel()); - // TODO layer -// this.addRenderLayer(new RpkLayer(this)); } @Override @@ -83,18 +81,6 @@ public class RpkItemRenderer extends GeoItemRenderer { if (!(itemStack.getItem() instanceof GunItem)) return; var data = GunData.from(itemStack); - if (name.equals("Cross1")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 1); - } - - if (name.equals("Cross2")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 2); - } - - if (name.equals("Cross3")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 3); - } - if (name.equals("humu1")) { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) != 0); } @@ -108,10 +94,22 @@ public class RpkItemRenderer extends GeoItemRenderer { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); } - if (data.attachment.get(AttachmentType.SCOPE) == 3 + if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3 && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { 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, packedLightIn, 0, 0.27363125, 20, 1, 255, 0, 0, 255, "pkas", true); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.28, 13, 1, 0, 255, 0, 255, "1p78", false); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.28, 36, (float) ClientEventHandler.customZoom, 255, 0, 0, 255, "lpvo", true); + } + float height = 0.02f; if ((GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 || GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3) && ClientEventHandler.zoom) { diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java b/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java index b04f4e838..5f53a288d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java @@ -20,6 +20,8 @@ import net.minecraft.world.item.alchemy.PotionContents; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; + @JeiPlugin public class SbwJEIPlugin implements IModPlugin { @@ -42,7 +44,7 @@ public class SbwJEIPlugin implements IModPlugin { public void registerItemSubtypes(ISubtypeRegistration registration) { registration.registerSubtypeInterpreter(ModItems.CONTAINER.get(), new ISubtypeInterpreter<>() { @Override - public @Nullable Object getSubtypeData(ItemStack ingredient, UidContext context) { + public @NotNull Object getSubtypeData(ItemStack ingredient, @NotNull UidContext context) { var data = ingredient.get(DataComponents.BLOCK_ENTITY_DATA); var tag = data != null ? data.copyTag() : new CompoundTag(); if (tag.contains("EntityType")) { @@ -52,13 +54,15 @@ public class SbwJEIPlugin implements IModPlugin { } @Override - public String getLegacyStringSubtypeInfo(ItemStack ingredient, UidContext context) { + @ParametersAreNonnullByDefault + public @NotNull String getLegacyStringSubtypeInfo(ItemStack ingredient, UidContext context) { return (String) getSubtypeData(ingredient, context); } }); registration.registerSubtypeInterpreter(ModItems.POTION_MORTAR_SHELL.get(), new ISubtypeInterpreter<>() { @Override + @ParametersAreNonnullByDefault public @Nullable Object getSubtypeData(ItemStack ingredient, UidContext context) { PotionContents contents = ingredient.get(DataComponents.POTION_CONTENTS); if (contents == null) { diff --git a/src/main/resources/assets/superbwarfare/geo/mk14ebr.geo.json b/src/main/resources/assets/superbwarfare/geo/mk14ebr.geo.json index 847538b87..52016e1b3 100644 --- a/src/main/resources/assets/superbwarfare/geo/mk14ebr.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/mk14ebr.geo.json @@ -64,6 +64,15 @@ "parent": "main", "pivot": [0, 3.13707, -7.2996] }, + { + "name": "cross", + "parent": "gun", + "pivot": [ + 0, + 5.11672, + -616.5 + ] + }, { "name": "flare", "parent": "gun", @@ -7539,489 +7548,6 @@ } ] }, - { - "name": "Cross1", - "parent": "gun", - "pivot": [0, 5.11672, -616.5], - "cubes": [ - { - "origin": [-1, 9.64406, -616.5], - "size": [2, 0.5, 0], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-2.4319, 9.05095, -616.5], - "size": [2, 0.5, 0], - "pivot": [-2.20684, 8.4195, -616.5], - "rotation": [0, 0, -22.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-3.98178, 9.05095, -616.5], - "size": [2, 0.5, 0], - "pivot": [-2.20684, 8.4195, -616.5], - "rotation": [0, 0, -45], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-5.41369, 9.64406, -616.5], - "size": [2, 0.5, 0], - "pivot": [-2.20684, 8.4195, -616.5], - "rotation": [0, 0, -67.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-5.07771, 3.54133, -616.5], - "size": [2, 0.5, 0], - "pivot": [-3.30277, 2.90988, -616.5], - "rotation": [0, 0, -135], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-6.50962, 4.13445, -616.5], - "size": [2, 0.5, 0], - "pivot": [-3.30277, 2.90988, -616.5], - "rotation": [0, 0, -157.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-3.52783, 3.54133, -616.5], - "size": [2, 0.5, 0], - "pivot": [-3.30277, 2.90988, -616.5], - "rotation": [0, 0, -112.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-5.77734, 4.86672, -616.5], - "size": [2, 0.5, 0], - "pivot": [-4.77734, 5.11672, -616.5], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.25, 10.14406, -616.5], - "size": [0.5, 2, 0], - "pivot": [0, 5.11672, -616.5], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.25, 10.14406, -616.5], - "size": [0.5, 2, 0], - "pivot": [0, 5.11672, -616.5], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [12.25, 98], "uv_size": [-0.25, 0.25]} - } - }, - { - "origin": [-0.25, 10.14406, -616.5], - "size": [0.5, 2, 0], - "uv": { - "south": {"uv": [12.25, 98], "uv_size": [-0.25, 0.25]} - } - }, - { - "origin": [-0.25, 10.14406, -616.5], - "size": [0.5, 2, 0], - "pivot": [0, 5.11672, -616.5], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.5, 4.61672, -616.5], - "size": [1, 1, 0], - "pivot": [0, 5.11672, -616.5], - "rotation": [0, 0, -135], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [3.52593, 8.38015, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 157.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [2.13479, 7.18581, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 112.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [2.94914, 7.64462, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 135], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [1.20684, 7.07357, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [0.30658, 7.32497, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 67.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.88776, 8.71612, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 22.5], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.42895, 7.90176, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, 45], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [3.77734, 9.28041, -616.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 4.9349, -616.5], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [12, 98], "uv_size": [0.25, 0.25]} - } - } - ] - }, - { - "name": "Cross2", - "parent": "gun", - "pivot": [0, -1.55125, -329.05], - "cubes": [ - { - "origin": [-3.675, -10.75125, -329.05], - "size": [7.35, 18.4, 0], - "uv": { - "south": {"uv": [219.25, 164], "uv_size": [36.75, 92]} - } - } - ] - }, - { - "name": "Cross3", - "parent": "gun", - "pivot": [0, 5.36125, -119.72735], - "cubes": [ - { - "origin": [-0.03649, -4.45415, -119.72735], - "size": [0.07299, 19.6308, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [25, 21], "uv_size": [0.25, 19.75]} - } - }, - { - "origin": [-0.03649, -4.45415, -119.72735], - "size": [0.07299, 19.6308, 0], - "uv": { - "south": {"uv": [11, 26], "uv_size": [0.25, 19.75]} - } - }, - { - "origin": [-0.06892, -4.45415, -119.72735], - "size": [0.13783, 4, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [61, 14], "uv_size": [0.25, 4]} - } - }, - { - "origin": [-0.06892, -4.45415, -119.72735], - "size": [0.13783, 4, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [21, 61], "uv_size": [0.25, 4]} - } - }, - { - "origin": [-0.06892, -4.45415, -119.72735], - "size": [0.13393, 4, 0], - "uv": { - "south": {"uv": [26, 61], "uv_size": [0.25, 4]} - } - }, - { - "origin": [-0.06892, -4.45415, -119.72735], - "size": [0.13393, 4, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [27, 61], "uv_size": [0.25, 4]} - } - } - ] - }, - { - "name": "bone75", - "parent": "Cross3", - "pivot": [0, 5.36125, -119.73789], - "cubes": [ - { - "origin": [0.03845, 4.94966, -119.73789], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 5.36125, -119.73789], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [44, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.10988, 4.94966, -119.73789], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 5.36125, -119.73789], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [93, 44], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.10955, 5.47113, -119.73789], - "size": [0.07142, 0.30491, 0], - "pivot": [0, 5.36125, -119.73789], - "rotation": [0, 0, 180], - "uv": { - "south": {"uv": [45, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [0.03845, 5.39938, -119.73789], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 5.36125, -119.73789], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [93, 45], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [0.03813, 5.47113, -119.73789], - "size": [0.07142, 0.30491, 0], - "pivot": [0, 5.36125, -119.73789], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [46, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.10988, 5.39938, -119.73789], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 5.36125, -119.73789], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [93, 46], "uv_size": [0.25, 0.25]} - } - } - ] - }, - { - "name": "bone173", - "parent": "Cross3", - "pivot": [0, 5.36125, -119.72735], - "cubes": [ - { - "origin": [-0.05329, 4.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [47, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 3.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [93, 47], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 2.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [48, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 1.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [93, 48], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 1.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [49, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 4.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [93, 49], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 3.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [50, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 2.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [93, 50], "uv_size": [0.25, 0.25]} - } - } - ] - }, - { - "name": "bone174", - "parent": "Cross3", - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "cubes": [ - { - "origin": [-0.05329, 4.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [51, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 3.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [93, 51], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 2.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [52, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 1.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [93, 52], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 1.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [53, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 4.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [93, 53], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 3.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [54, 93], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05329, 2.21929, -119.72735], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 5.36125, -119.72735], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [93, 54], "uv_size": [0.25, 0.25]} - } - } - ] - }, { "name": "qiaojia", "parent": "gun", diff --git a/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json b/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json index 33fe311be..85527e4e4 100644 --- a/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/qbz95.geo.json @@ -64,6 +64,15 @@ "parent": "fireRoot3", "pivot": [0, 0, 0] }, + { + "name": "cross", + "parent": "0", + "pivot": [ + 0, + 8.15156, + -318.5 + ] + }, { "name": "Barrel", "parent": "0", @@ -5388,528 +5397,6 @@ "parent": "hidden2", "pivot": [0.03166, 8.21932, -1.66038] }, - { - "name": "Cross1", - "parent": "0", - "pivot": [0, 8.15156, -318.5], - "cubes": [ - { - "origin": [-0.702, 7.44956, -318.5], - "size": [1.404, 1.404, 0], - "uv": { - "south": {"uv": [70.5, 9.25], "uv_size": [8.25, 8.25]} - } - } - ] - }, - { - "name": "Cross2", - "parent": "0", - "pivot": [0, 8.93672, -318.5], - "cubes": [ - { - "origin": [-0.33345, 8.60327, -318.5], - "size": [0.6669, 0.6669, 0], - "uv": { - "south": {"uv": [70.5, 9.25], "uv_size": [8.25, 8.25]} - } - } - ] - }, - { - "name": "Cross3", - "parent": "0", - "pivot": [0, 8.58047, -145.76641] - }, - { - "name": "bone86", - "parent": "Cross3", - "pivot": [0, 8.58047, -145.76641], - "cubes": [ - { - "origin": [-0.04821, 8.2957, -145.76641], - "size": [0.09642, 0.56953, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.5, 12], "uv_size": [-1.75, 2.25]} - } - }, - { - "origin": [-0.04821, 8.2957, -145.76641], - "size": [0.09642, 0.56953, 0], - "uv": { - "south": {"uv": [75.5, 12], "uv_size": [-1.75, 2.25]} - } - } - ] - }, - { - "name": "bone120", - "parent": "Cross3", - "pivot": [0, 8.58047, -145.76641], - "cubes": [ - { - "origin": [-0.05329, 7.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 7.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 6.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 5.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 4.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 4.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 5.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 6.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - } - ] - }, - { - "name": "bone87", - "parent": "bone120", - "pivot": [0, 8.58047, -145.76641], - "cubes": [ - { - "origin": [-0.03649, -1.23493, -145.76641], - "size": [0.07299, 9.5308, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-5.03649, 3.76507, -145.76641], - "size": [0.07299, 9.5308, 0], - "pivot": [-5, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "east": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "south": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "west": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "up": {"uv": [5, 5.75], "uv_size": [0.75, -0.75]}, - "down": {"uv": [5, 5.75], "uv_size": [0.75, -0.75]} - } - }, - { - "origin": [-0.03649, -1.23493, -145.76641], - "size": [0.07299, 9.5308, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -180], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.03649, -1.23493, -145.76641], - "size": [0.07299, 9.5308, 0], - "uv": { - "north": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "east": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "south": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "west": {"uv": [5.75, 5], "uv_size": [-0.75, 0.75]}, - "up": {"uv": [5, 5.75], "uv_size": [0.75, -0.75]}, - "down": {"uv": [5, 5.75], "uv_size": [0.75, -0.75]} - } - }, - { - "origin": [-0.06892, -1.23493, -145.76641], - "size": [0.13783, 4, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.06892, -1.23493, -145.76641], - "size": [0.13783, 4, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.06892, -1.23493, -145.76641], - "size": [0.13393, 4, 0], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.06892, -1.23493, -145.76641], - "size": [0.13393, 4, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -180], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 7.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 6.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 5.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 4.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 4.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 7.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 6.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 5.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - } - ] - }, - { - "name": "bone121", - "parent": "bone120", - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "cubes": [ - { - "origin": [-0.05329, 7.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 7.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 6.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 5.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 4.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 4.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 5.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - }, - { - "origin": [-0.05329, 6.4385, -145.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 8.58047, -145.76641], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "east": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "south": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "west": {"uv": [5, 5], "uv_size": [0.75, 0.75]}, - "up": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]}, - "down": {"uv": [5.75, 5.75], "uv_size": [-0.75, -0.75]} - } - } - ] - }, { "name": "tiba", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/geo/rpk.geo.json b/src/main/resources/assets/superbwarfare/geo/rpk.geo.json index 0e85ed6aa..5e553ea89 100644 --- a/src/main/resources/assets/superbwarfare/geo/rpk.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/rpk.geo.json @@ -54,6 +54,15 @@ "parent": "fireRoot3", "pivot": [0, 0, 0] }, + { + "name": "cross", + "parent": "0", + "pivot": [ + 0, + 4.75, + -140 + ] + }, { "name": "shell", "parent": "0", @@ -7737,311 +7746,6 @@ } ] }, - { - "name": "Cross1", - "parent": "0", - "pivot": [0, 4.75, -140], - "cubes": [ - { - "origin": [-2, 2.75, -140], - "size": [4, 4, 0], - "uv": { - "south": {"uv": [4.5, 216], "uv_size": [150.5, 150.5]} - } - } - ] - }, - { - "name": "Cross2", - "parent": "0", - "pivot": [0, 4.58297, -71], - "cubes": [ - { - "origin": [-3.37756, -0.96785, -71], - "size": [6.73263, 5.99414, 0], - "uv": { - "south": {"uv": [160.5, 199], "uv_size": [351.5, 313]} - } - } - ] - }, - { - "name": "Cross3", - "parent": "0", - "pivot": [0, 4.56844, -82.76641], - "cubes": [ - { - "origin": [-0.03649, -5.24696, -82.76641], - "size": [0.07299, 19.6308, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.03649, -5.24696, -82.76641], - "size": [0.07299, 19.6308, 0], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.06892, -5.24696, -82.76641], - "size": [0.13783, 4, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.06892, -5.24696, -82.76641], - "size": [0.13783, 4, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.06892, -5.24696, -82.76641], - "size": [0.13393, 4, 0], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.06892, -5.24696, -82.76641], - "size": [0.13393, 4, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - } - ] - }, - { - "name": "bone120", - "parent": "Cross3", - "pivot": [0, 4.56844, -82.77695], - "cubes": [ - { - "origin": [0.03845, 4.15685, -82.77695], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 4.56844, -82.77695], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [77.7, 289.45], "uv_size": [3.8, 3.55]} - } - }, - { - "origin": [-0.10988, 4.15685, -82.77695], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 4.56844, -82.77695], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [77.7, 289.45], "uv_size": [3.8, 3.55]} - } - }, - { - "origin": [-0.10955, 4.67832, -82.77695], - "size": [0.07142, 0.30491, 0], - "pivot": [0, 4.56844, -82.77695], - "rotation": [0, 0, 180], - "uv": { - "south": {"uv": [77.7, 289.45], "uv_size": [3.8, 3.55]} - } - }, - { - "origin": [0.03845, 4.60656, -82.77695], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 4.56844, -82.77695], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [77.7, 289.45], "uv_size": [3.8, 3.55]} - } - }, - { - "origin": [0.03813, 4.67832, -82.77695], - "size": [0.07142, 0.30491, 0], - "pivot": [0, 4.56844, -82.77695], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [77.7, 289.45], "uv_size": [3.8, 3.55]} - } - }, - { - "origin": [-0.10988, 4.60656, -82.77695], - "size": [0.07142, 0.37347, 0], - "pivot": [0, 4.56844, -82.77695], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [77.7, 289.45], "uv_size": [3.8, 3.55]} - } - } - ] - }, - { - "name": "bone173", - "parent": "Cross3", - "pivot": [0, 4.56844, -82.76641], - "cubes": [ - { - "origin": [-0.05329, 3.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 2.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 1.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 0.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 0.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 3.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 2.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 1.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - } - ] - }, - { - "name": "bone174", - "parent": "Cross3", - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "cubes": [ - { - "origin": [-0.05329, 3.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 2.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 1.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 0.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 0.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 3.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 2.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - }, - { - "origin": [-0.05329, 1.42647, -82.76641], - "size": [0.10658, 0.07656, 0], - "pivot": [0, 4.56844, -82.76641], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [75.2, 215.95], "uv_size": [1.3, 1.55]} - } - } - ] - }, { "name": "Stock0", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/1p78.png b/src/main/resources/assets/superbwarfare/textures/crosshair/1p78.png new file mode 100644 index 000000000..6b1edf4e6 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/crosshair/1p78.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/pkas.png b/src/main/resources/assets/superbwarfare/textures/crosshair/pkas.png new file mode 100644 index 000000000..a950aa671 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/crosshair/pkas.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/mk14.png b/src/main/resources/assets/superbwarfare/textures/item/mk14.png index f79562cfb..3a5c8b382 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/mk14.png and b/src/main/resources/assets/superbwarfare/textures/item/mk14.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/mk14_e.png b/src/main/resources/assets/superbwarfare/textures/item/mk14_e.png deleted file mode 100644 index 0e2fd35cd..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/mk14_e.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/rpk.png b/src/main/resources/assets/superbwarfare/textures/item/rpk.png index 29538a246..21f31d6df 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/rpk.png and b/src/main/resources/assets/superbwarfare/textures/item/rpk.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/rpk_e.png b/src/main/resources/assets/superbwarfare/textures/item/rpk_e.png deleted file mode 100644 index acbd373f1..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/rpk_e.png and /dev/null differ