diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java deleted file mode 100644 index 8ab54d820..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.atsuishio.superbwarfare.client.layer.gun; - -import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.rifle.AK47Item; -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 AK47Layer extends GeoRenderLayer { - - private static final ResourceLocation LAYER = Mod.loc("textures/item/ak47_e.png"); - - public AK47Layer(GeoRenderer itemGeoRenderer) { - super(itemGeoRenderer); - } - - @Override - public void render(PoseStack poseStack, AK47Item 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/AK47ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java index 1ca4d698c..97abe4214 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/AK47ItemModel.java @@ -46,7 +46,6 @@ public class AK47ItemModel extends GeoModel { GeoBone scope = getAnimationProcessor().getBone("Scope1"); GeoBone scope2 = getAnimationProcessor().getBone("Scope2"); GeoBone scope3 = getAnimationProcessor().getBone("Scope3"); - GeoBone cross3 = getAnimationProcessor().getBone("Cross3"); GeoBone shuan = getAnimationProcessor().getBone("shuan"); Player player = Minecraft.getInstance().player; @@ -87,13 +86,13 @@ public class AK47ItemModel extends GeoModel { case 0 -> 0.55f; case 1 -> 0.2f; case 2 -> 0.87f; - case 3 -> 0.78f; + case 3 -> 0.84f; default -> 0f; }; float posZ = switch (type) { case 0, 1 -> 2.8f; case 2 -> 4.74f; - case 3 -> 3.9f; + case 3 -> 4.5f; default -> 0f; }; @@ -139,9 +138,6 @@ public class AK47ItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); - cross3.setRotZ(0.01f * (float) (ClientEventHandler.recoilHorizon * fp)); - cross3.setPosY(-0.23f * (float) (fp + 2.3 * fr)); - 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/renderer/item/AK47ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java index 0fe73eaf2..26752f595 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -24,11 +24,8 @@ import java.util.HashSet; import java.util.Set; public class AK47ItemRenderer extends GeoItemRenderer { - public AK47ItemRenderer() { super(new AK47ItemModel()); - // TODO layer -// this.addRenderLayer(new AK47Layer(this)); } @Override @@ -82,18 +79,6 @@ public class AK47ItemRenderer 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); } @@ -113,6 +98,14 @@ public class AK47ItemRenderer 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.03, 0.27363125, 20, 255, 0, 0, 255, "kobra"); + case 2 -> AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, -0.04, 0.28, 18, 0, 0, 0, 255, "pso_1"); + case 3 -> AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, -0.03, 0.28, Math.max(30 - 4 * ClientEventHandler.customZoom, 3), 255, 0, 0, 255, "lpvo"); + } + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.06875, 0.3); ItemModelHelper.handleGunAttachments(bone, itemStack, name); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index 41bc2809f..015a11063 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -8,14 +8,12 @@ import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.data.GunData; import com.atsuishio.superbwarfare.item.gun.data.value.AttachmentType; import com.atsuishio.superbwarfare.item.gun.rifle.Hk416Item; -import com.atsuishio.superbwarfare.tools.GunsTool; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.Mth; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -26,8 +24,6 @@ import java.util.HashSet; import java.util.Set; public class Hk416ItemRenderer extends GeoItemRenderer { - public static double zoomFactor; - public Hk416ItemRenderer() { super(new Hk416ItemModel()); } @@ -94,7 +90,6 @@ public class Hk416ItemRenderer extends GeoItemRenderer { } int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); - zoomFactor = Mth.lerp(0.01 * partialTick, zoomFactor, GunsTool.getGunDoubleTag(GunData.from(itemStack).tag, "CustomZoom")); switch (scopeType) { case 1 -> @@ -102,9 +97,8 @@ public class Hk416ItemRenderer extends GeoItemRenderer { case 2 -> AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.313, 9, 255, 0, 0, 255, "acog"); case 3 -> - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.29, Math.max(38 - 5.2 * zoomFactor, 3), 255, 0, 0, 255, "lpvo"); + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.29, Math.max(44 - 5 * ClientEventHandler.customZoom, 3), 255, 0, 0, 255, "lpvo"); } - ; AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.440625, 0.3); diff --git a/src/main/resources/assets/superbwarfare/geo/ak.geo.json b/src/main/resources/assets/superbwarfare/geo/ak.geo.json index 56dd1c20d..530e8f222 100644 --- a/src/main/resources/assets/superbwarfare/geo/ak.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ak.geo.json @@ -6059,424 +6059,9 @@ ] }, { - "name": "Cross1", + "name": "cross", "parent": "0", - "pivot": [0.4789, 4.37813, -101], - "cubes": [ - { - "origin": [-2.3961, 1.50313, -101], - "size": [5.75, 5.75, 0], - "uv": { - "north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]}, - "east": {"uv": [0, 0], "uv_size": [0, 8]}, - "south": {"uv": [76.0127, 17.06592], "uv_size": [5.75, 5.75]}, - "west": {"uv": [0, 0], "uv_size": [0, 8]}, - "up": {"uv": [8, 0], "uv_size": [-8, 0]}, - "down": {"uv": [8, 0], "uv_size": [-8, 0]} - } - } - ] - }, - { - "name": "Cross2", - "parent": "0", - "pivot": [0.19453, 3.82344, -94.66641], - "cubes": [ - { - "origin": [-3.90209, -5.64975, -264.66641], - "size": [10.99325, 10.99325, 0], - "uv": { - "south": {"uv": [96.5625, 0], "uv_size": [56, 56]} - } - } - ] - }, - { - "name": "Cross3", - "parent": "0", - "pivot": [0.49609, 4.55547, -87.3082], - "cubes": [ - { - "origin": [0.46557, -3.65413, -87.3082], - "size": [0.06105, 16.4192, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.46557, -3.65413, -87.3082], - "size": [0.06105, 16.4192, 0], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.43845, -3.65413, -87.3082], - "size": [0.11528, 3.3456, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.43845, -3.65413, -87.3082], - "size": [0.11528, 3.3456, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.43845, -3.65413, -87.3082], - "size": [0.11201, 3.3456, 0], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.43845, -3.65413, -87.3082], - "size": [0.11201, 3.3456, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -180], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - } - ] - }, - { - "name": "bone173", - "parent": "Cross3", - "pivot": [0, 5.22344, -103.76641], - "cubes": [ - { - "origin": [0.45152, 3.60033, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 2.76393, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 1.92753, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 1.09113, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 1.09113, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 3.60033, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 2.76393, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 1.92753, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.49609, 4.55547, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - } - ] - }, - { - "name": "bone174", - "parent": "Cross3", - "pivot": [0, 5.22344, -103.76641], - "rotation": [0, 0, -90], - "cubes": [ - { - "origin": [-0.37834, 4.80479, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [-0.37834, 3.96839, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [-0.37834, 3.13199, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [-0.37834, 2.29559, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 1.09113, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 3.60033, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 2.76393, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - }, - { - "origin": [0.45152, 1.92753, -87.3082], - "size": [0.08914, 0.06404, 0], - "pivot": [0.08116, 5.1577, -97.04101], - "rotation": [0, 0, 90], - "uv": { - "north": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "east": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "south": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "west": {"uv": [20.25, 150.125], "uv_size": [0.375, 0.375]}, - "up": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]}, - "down": {"uv": [20.625, 150.5], "uv_size": [-0.375, -0.375]} - } - } - ] - }, - { - "name": "bone87", - "parent": "Cross3", - "pivot": [0.49609, 4.55391, -87.3082], - "cubes": [ - { - "origin": [0.60937, 4.12405, -87.3082], - "size": [0.06105, 0.3192, 0], - "pivot": [0.49609, 4.47584, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [76.625, 19.75], "uv_size": [0.125, 0.25]} - } - }, - { - "origin": [0.32177, 4.12405, -87.3082], - "size": [0.06105, 0.3192, 0], - "pivot": [0.49609, 4.47584, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [76.75, 19.75], "uv_size": [-0.125, 0.25]} - } - }, - { - "origin": [0.40246, 4.48934, -87.3082], - "size": [0.06105, 0.26061, 0], - "pivot": [0.49609, 4.47584, -87.3082], - "rotation": [0, 0, 180], - "uv": { - "south": {"uv": [76.625, 20], "uv_size": [0.125, -0.25]} - } - }, - { - "origin": [0.44855, 4.50842, -87.3082], - "size": [0.06105, 0.3192, 0], - "pivot": [0.49609, 4.47584, -87.3082], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [76.625, 20], "uv_size": [0.125, -0.25]} - } - }, - { - "origin": [0.52868, 4.48934, -87.3082], - "size": [0.06105, 0.26061, 0], - "pivot": [0.49609, 4.47584, -87.3082], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [76.75, 20], "uv_size": [-0.125, -0.25]} - } - }, - { - "origin": [0.48259, 4.50842, -87.3082], - "size": [0.06105, 0.3192, 0], - "pivot": [0.49609, 4.47584, -87.3082], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [76.75, 20], "uv_size": [-0.125, -0.25]} - } - } - ] + "pivot": [0.4789, 4.37813, -1000] }, { "name": "Stock0", diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/kobra.png b/src/main/resources/assets/superbwarfare/textures/crosshair/kobra.png new file mode 100644 index 000000000..e48dce7c8 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/crosshair/kobra.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/pso_1.png b/src/main/resources/assets/superbwarfare/textures/crosshair/pso_1.png new file mode 100644 index 000000000..9ac912fb5 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/crosshair/pso_1.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ak47_e.png b/src/main/resources/assets/superbwarfare/textures/item/ak47_e.png deleted file mode 100644 index 6e2c76796..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/ak47_e.png and /dev/null differ