优化阴险准星

src/main/java/com/atsuishio/superbwarfare/client/layer/gun/InsidiousLayer.java

@@ -1,27 +0,0 @@
-package com.atsuishio.superbwarfare.client.layer.gun;
-
-import com.atsuishio.superbwarfare.Mod;
-import com.atsuishio.superbwarfare.item.gun.rifle.InsidiousItem;
-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 InsidiousLayer extends GeoRenderLayer<InsidiousItem> {
-    private static final ResourceLocation LAYER = Mod.loc("textures/item/insidious_e.png");
-
-    public InsidiousLayer(GeoRenderer<InsidiousItem> entityRenderer) {
-        super(entityRenderer);
-    }
-
-    @Override
-    public void render(PoseStack poseStack, InsidiousItem 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);
-    }
-}

src/main/java/com/atsuishio/superbwarfare/client/model/item/InsidiousItemModel.java

@@ -53,8 +53,8 @@ public class InsidiousItemModel extends GeoModel<InsidiousItem> {
         double fp = ClientEventHandler.firePos;
         double fr = ClientEventHandler.fireRot;
 
-        gun.setPosX(4.18f * (float) zp);
+        gun.setPosX(4.23f * (float) zp);
-        gun.setPosY(1.25f * (float) zp - (float) (0.2f * zpz));
+        gun.setPosY(1.28f * (float) zp - (float) (0.2f * zpz));
         gun.setPosZ(6.2f * (float) zp + (float) (0.5f * zpz));
         gun.setScaleZ(1f - (0.82f * (float) zp));
 

src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.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.InsidiousItemModel;
-import com.atsuishio.superbwarfare.event.ClientEventHandler;
 import com.atsuishio.superbwarfare.item.gun.GunItem;
 import com.atsuishio.superbwarfare.item.gun.rifle.InsidiousItem;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -24,8 +23,6 @@ public class InsidiousItemRenderer extends GeoItemRenderer<InsidiousItem> {
 
     public InsidiousItemRenderer() {
         super(new InsidiousItemModel());
-        // TODO layer
-//        this.addRenderLayer(new InsidiousLayer(this));
     }
 
     @Override
@@ -88,9 +85,7 @@ public class InsidiousItemRenderer extends GeoItemRenderer<InsidiousItem> {
             bone.setRotZ(-(System.currentTimeMillis() % 36000000) / 400f);
         }
 
-        if (name.equals("cross")) {
+        AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.359325, 40, 0.33f, 255, 0, 0, 255, "insidious", false);
-            bone.setHidden(ClientEventHandler.zoomPos < 0.7 || !ClientEventHandler.zoom);
-        }
 
         if (renderingArms) {
             AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false);

src/main/resources/assets/superbwarfare/geo/insidious.geo.json

@@ -4315,89 +4315,7 @@
 				{
 					"name": "cross",
 					"parent": "0",
-					"pivot": [0.00001, 5.74923, -179.99267],
+					"pivot": [0.00001, 5.74923, -179.99267]
-					"cubes": [
-						{
-							"origin": [-0.14374, 6.29995, -180.05127],
-							"size": [0.28752, 0.13128, 0.1172],
-							"uv": {
-								"north": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"east": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"south": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"west": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"up": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]},
-								"down": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]}
-							}
-						},
-						{
-							"origin": [0.27594, 5.21483, -180.05127],
-							"size": [0.19376, 0.78752, 0.1172],
-							"pivot": [0.03122, 5.74923, -180.05127],
-							"rotation": [0, 0, 30],
-							"uv": {
-								"north": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"east": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"south": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"west": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"up": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]},
-								"down": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]}
-							}
-						},
-						{
-							"origin": [0.27594, 5.49611, -180.05127],
-							"size": [0.19376, 0.78752, 0.1172],
-							"pivot": [0.03122, 5.74923, -180.05127],
-							"rotation": [0, 0, -30],
-							"uv": {
-								"north": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"east": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"south": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"west": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"up": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]},
-								"down": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]}
-							}
-						},
-						{
-							"origin": [-0.47806, 5.46483, -180.05127],
-							"size": [0.19376, 0.78752, 0.1172],
-							"pivot": [0.02282, 5.71795, -180.05127],
-							"rotation": [0, 0, 30],
-							"uv": {
-								"north": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"east": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"south": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"west": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"up": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]},
-								"down": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]}
-							}
-						},
-						{
-							"origin": [-0.47806, 5.24611, -180.05127],
-							"size": [0.19376, 0.78752, 0.1172],
-							"pivot": [0.02282, 5.78051, -180.05127],
-							"rotation": [0, 0, -30],
-							"uv": {
-								"north": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"east": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"south": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"west": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"up": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]},
-								"down": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]}
-							}
-						},
-						{
-							"origin": [-0.14374, 5.06723, -180.05127],
-							"size": [0.28752, 0.13128, 0.1172],
-							"uv": {
-								"north": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"east": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"south": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"west": {"uv": [18, 69], "uv_size": [0.5, 0.5]},
-								"up": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]},
-								"down": {"uv": [18.5, 69.5], "uv_size": [-0.5, -0.5]}
-							}
-						}
-					]
 				},
 				{
 					"name": "flare",