diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java index f53b5757d..e57bbdd7d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/SentinelItemModel.java @@ -63,9 +63,6 @@ public class SentinelItemModel extends GeoModel { scope.setScaleZ(1f - (0.8f * (float) zp)); cb.setRotZ((float) (cb.getRotZ() + times * 10 * ClientEventHandler.chamberRot)); - GeoBone holo = getAnimationProcessor().getBone("holo"); - holo.setPosY(0.09f); - var data = GunData.from(stack); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SentinelItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SentinelItemRenderer.java index 5940a0df5..f975e0697 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SentinelItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SentinelItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.model.item.SentinelItemModel; -import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem; import com.mojang.blaze3d.vertex.PoseStack; @@ -81,12 +80,6 @@ public class SentinelItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.53125, 0.6); - - if (name.equals("holo")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || !ClientEventHandler.zoom); - } - var cap = itemStack.getCapability(Capabilities.EnergyStorage.ITEM); var flag = cap != null && cap.getEnergyStored() > 0; @@ -94,6 +87,9 @@ public class SentinelItemRenderer extends GeoItemRenderer { bone.setHidden(!flag); } + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.265, -0.05, 0.075f, 255, 0, 0, 255, "apex_3x", false); + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.53125, 0.6); + if (renderingArms) { AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); } diff --git a/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json b/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json index f4d690137..47aa0a612 100644 --- a/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/sentinel.geo.json @@ -45,6 +45,15 @@ "pivot": [0, 0, 7] }, { + "name": "cross", + "parent": "0", + "pivot": [ + 0, + 4.10312, + -100 + ] + }, + { "name": "flare", "parent": "0", "pivot": [0, 1.35156, -24.5] @@ -6009,20 +6018,6 @@ "parent": "0", "pivot": [-0.00223, 0.07256, 0.13692] }, - { - "name": "holo", - "parent": "scope2", - "pivot": [0.49609, 4.50312, 2], - "cubes": [ - { - "origin": [-0.6, 3.77876, 1.3], - "size": [1.2, 0.38, 0], - "uv": { - "south": {"uv": [58.0127, 79.31592], "uv_size": [69.7373, 22.375]} - } - } - ] - }, { "name": "ammobar", "parent": "scope2", diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/apex_3x.png b/src/main/resources/assets/superbwarfare/textures/crosshair/apex_3x.png new file mode 100644 index 000000000..06c4d2b9c Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/crosshair/apex_3x.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/sentinel.png b/src/main/resources/assets/superbwarfare/textures/item/sentinel.png index 18069e2b4..f87e1fb7e 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/sentinel.png and b/src/main/resources/assets/superbwarfare/textures/item/sentinel.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/sentinel_e.png b/src/main/resources/assets/superbwarfare/textures/item/sentinel_e.png index 1433f6e55..7cac48953 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/sentinel_e.png and b/src/main/resources/assets/superbwarfare/textures/item/sentinel_e.png differ