diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java index 60b05b2e9..1147eb0a5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java @@ -79,27 +79,6 @@ public class M4ItemRenderer extends GeoItemRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); 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 - || GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 2 - || NBTTool.getTag(itemStack).getBoolean("ScopeAlt")); - } - - if (name.equals("CrossAlt")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 - || GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 2 - || !(NBTTool.getTag(itemStack).getBoolean("ScopeAlt"))); - } - - 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 && !NBTTool.getTag(itemStack).getBoolean("ScopeAlt") && (name.equals("hidden"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); @@ -115,7 +94,7 @@ public class M4ItemRenderer extends GeoItemRenderer { switch (scopeType) { case 1 -> AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.32, 30, 1.2f, 255, 0, 0, 255, "dot", false); case 2 -> { - if (itemStack.getOrCreateTag().getBoolean("ScopeAlt")) { + if (NBTTool.getTag(itemStack).getBoolean("ScopeAlt")) { AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.34, 30, 0.25f, 255, 0, 0, 255, "delta", false); } else { AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.294, 13, 0.87f, 255, 0, 0, 255, "hamr", true); diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/acog.png b/src/main/resources/assets/superbwarfare/textures/crosshair/acog.png index 26a255510..6d954d265 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/crosshair/acog.png and b/src/main/resources/assets/superbwarfare/textures/crosshair/acog.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 index 9ac912fb5..d86677d74 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/crosshair/pso_1.png and b/src/main/resources/assets/superbwarfare/textures/crosshair/pso_1.png differ