From d5ec42c437d271cda8dda1ffff81a19c29a04f3c Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Sat, 26 Apr 2025 01:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=98=B4=E9=99=A9=E5=87=86?= =?UTF-8?q?=E6=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/layer/gun/InsidiousLayer.java | 27 ------ .../client/model/item/InsidiousItemModel.java | 4 +- .../renderer/item/InsidiousItemRenderer.java | 7 +- .../superbwarfare/geo/insidious.geo.json | 84 +----------------- .../textures/crosshair/insidious.png | Bin 0 -> 11342 bytes .../textures/item/insidious_e.png | Bin 362 -> 0 bytes 6 files changed, 4 insertions(+), 118 deletions(-) delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/layer/gun/InsidiousLayer.java create mode 100644 src/main/resources/assets/superbwarfare/textures/crosshair/insidious.png delete mode 100644 src/main/resources/assets/superbwarfare/textures/item/insidious_e.png diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/InsidiousLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/InsidiousLayer.java deleted file mode 100644 index 1e49a58a5..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/InsidiousLayer.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.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 { - private static final ResourceLocation LAYER = Mod.loc("textures/item/insidious_e.png"); - - public InsidiousLayer(GeoRenderer 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); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/InsidiousItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/InsidiousItemModel.java index 03db19f11..608157c6e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/InsidiousItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/InsidiousItemModel.java @@ -53,8 +53,8 @@ public class InsidiousItemModel extends GeoModel { double fp = ClientEventHandler.firePos; double fr = ClientEventHandler.fireRot; - gun.setPosX(4.18f * (float) zp); - gun.setPosY(1.25f * (float) zp - (float) (0.2f * zpz)); + gun.setPosX(4.23f * (float) zp); + 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)); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java index 4a059a255..49d777d7d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/InsidiousItemRenderer.java +++ b/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 { public InsidiousItemRenderer() { super(new InsidiousItemModel()); - // TODO layer -// this.addRenderLayer(new InsidiousLayer(this)); } @Override @@ -88,9 +85,7 @@ public class InsidiousItemRenderer extends GeoItemRenderer { bone.setRotZ(-(System.currentTimeMillis() % 36000000) / 400f); } - if (name.equals("cross")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || !ClientEventHandler.zoom); - } + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.359325, 40, 0.33f, 255, 0, 0, 255, "insidious", false); if (renderingArms) { AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); diff --git a/src/main/resources/assets/superbwarfare/geo/insidious.geo.json b/src/main/resources/assets/superbwarfare/geo/insidious.geo.json index aa5ae27b6..409389e14 100644 --- a/src/main/resources/assets/superbwarfare/geo/insidious.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/insidious.geo.json @@ -4315,89 +4315,7 @@ { "name": "cross", "parent": "0", - "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]} - } - } - ] + "pivot": [0.00001, 5.74923, -179.99267] }, { "name": "flare", diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/insidious.png b/src/main/resources/assets/superbwarfare/textures/crosshair/insidious.png new file mode 100644 index 0000000000000000000000000000000000000000..fed57bd22550afa8dd56137935d2d68ea4546d62 GIT binary patch literal 11342 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 E0|*Nue*gdg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/textures/item/insidious_e.png b/src/main/resources/assets/superbwarfare/textures/item/insidious_e.png deleted file mode 100644 index acf40e02a163ed65fe1cfd9d5452fb1ec33f138a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%U;1OBOz`!jG!i)^F=12fl z$auOqhE&XXdybKpfq{d0!FT=IWD8jp1(5bZ0V