From 9c50e49aca44d64269100b24b8a9ec0b5b5dd33d Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 31 May 2025 17:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=B9=E6=AE=8A=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/BocekItemModel.java | 20 ++++++++--------- .../client/model/item/TaserItemModel.java | 14 +++++------- .../renderer/gun/BocekItemRenderer.java | 22 +++++++++---------- .../renderer/gun/TaserItemRenderer.java | 6 +---- .../item/gun/special/BocekItem.java | 8 +++++++ .../item/gun/special/TaserItem.java | 4 ++++ 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java index b4947931f..52a2aa249 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/BocekItemModel.java @@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.client.model.item; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; -import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.special.BocekItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -12,9 +11,9 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animation.AnimationState; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.model.GeoModel; -public class BocekItemModel extends GeoModel { +public class BocekItemModel extends CustomGunModel { + public static float rightHandPosZ; @Override @@ -33,19 +32,19 @@ public class BocekItemModel extends GeoModel { } @Override - public void setCustomAnimations(BocekItem animatable, long instanceId, AnimationState animationState) { + public void setCustomAnimations(BocekItem animatable, long instanceId, AnimationState animationState) { + Player player = Minecraft.getInstance().player; + if (player == null) return; + ItemStack stack = player.getMainHandItem(); + if (shouldCancelRender(stack, animationState)) return; + GeoBone gun = getAnimationProcessor().getBone("bone"); GeoBone shen = getAnimationProcessor().getBone("shen"); GeoBone dRing = getAnimationProcessor().getBone("D_ring"); GeoBone rightHand = getAnimationProcessor().getBone("safang"); GeoBone leftHand = getAnimationProcessor().getBone("lh"); - Player player = Minecraft.getInstance().player; - if (player == null) return; - ItemStack stack = player.getMainHandItem(); - if (!(stack.getItem() instanceof GunItem)) return; - - float times = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(); + float times = 0.6f * (float) Math.min(Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(), 0.8); double pp = ClientEventHandler.bowPullPos; double pp2 = 1 - ClientEventHandler.bowPullPos; @@ -100,5 +99,4 @@ public class BocekItemModel extends GeoModel { GeoBone.setRotY(GeoBone.getRotY() * m); GeoBone.setRotZ(GeoBone.getRotZ() * m); } - } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java index 931c1e3c3..6da991cba 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java @@ -4,7 +4,6 @@ import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay; import com.atsuishio.superbwarfare.event.ClientEventHandler; -import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.special.TaserItem; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; @@ -13,9 +12,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animation.AnimationState; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.model.GeoModel; -public class TaserItemModel extends GeoModel { +public class TaserItemModel extends CustomGunModel { @Override public ResourceLocation getAnimationResource(TaserItem animatable) { @@ -33,14 +31,14 @@ public class TaserItemModel extends GeoModel { } @Override - public void setCustomAnimations(TaserItem animatable, long instanceId, AnimationState animationState) { - GeoBone gun = getAnimationProcessor().getBone("bone"); - GeoBone shen = getAnimationProcessor().getBone("shen"); - + public void setCustomAnimations(TaserItem animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); - if (!(stack.getItem() instanceof GunItem)) return; + if (shouldCancelRender(stack, animationState)) return; + + GeoBone gun = getAnimationProcessor().getBone("bone"); + GeoBone shen = getAnimationProcessor().getBone("shen"); float times = 0.6f * (float) Math.min(Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(), 0.8); double zt = ClientEventHandler.zoomTime; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java index 0de13c3b0..5b85d23ef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/BocekItemRenderer.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.FastColor; import net.minecraft.world.item.ItemStack; import org.joml.Matrix4f; +import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.util.RenderUtil; @@ -70,20 +71,19 @@ public class BocekItemRenderer extends CustomGunRenderer { if (player == null) return; ItemStack itemStack = player.getMainHandItem(); - if (!(itemStack.getItem() instanceof GunItem)) return; + if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { + if (name.equals("arrow")) { + var data = GunData.from(itemStack); + bone.setHidden(data.ammo.get() == 0); + } + if (name.equals("arrow2")) { + var data = GunData.from(itemStack); + bone.setHidden(data.ammo.get() != 0); + } - if (name.equals("arrow")) { - var data = GunData.from(itemStack); - bone.setHidden(data.ammo.get() == 0); + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0.002, 0.1790625, 0.13, 0.08f, 255, 0, 0, 255, "dot", false); } - if (name.equals("arrow2")) { - var data = GunData.from(itemStack); - bone.setHidden(data.ammo.get() != 0); - } - - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0.002, 0.1790625, 0.13, 0.08f, 255, 0, 0, 255, "dot", false); - if (renderingArms) { AnimationHelper.renderArms(player, this.transformType, stack, name, bone, buffer, type, packedLightIn, false); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java index 27f248a4b..b38a14be1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java @@ -3,14 +3,12 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.model.item.TaserItemModel; import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.special.TaserItem; 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.world.item.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; public class TaserItemRenderer extends CustomGunRenderer { @@ -33,11 +31,9 @@ public class TaserItemRenderer extends CustomGunRenderer { var player = mc.player; if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (!(itemStack.getItem() instanceof GunItem)) return; if (renderingArms) { - AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); + AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java index dba196082..7406c3cef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java @@ -23,12 +23,14 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.level.Level; import net.neoforged.neoforge.network.PacketDistributor; import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animation.*; +import software.bernie.geckolib.constant.DataTickets; import software.bernie.geckolib.renderer.GeoItemRenderer; import javax.annotation.ParametersAreNonnullByDefault; @@ -51,6 +53,8 @@ public class BocekItem extends GunItem { if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; + if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.idle")); if (ClientEventHandler.bowPull) { return event.setAndContinue(RawAnimation.begin().thenPlayAndHold("animation.bocek.pull")); @@ -72,6 +76,8 @@ public class BocekItem extends GunItem { if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; + if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.idle")); if (GunsTool.getGunIntTag(GunData.from(stack).tag, "ArrowEmpty") > 0) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.bocek.fire")); @@ -85,6 +91,8 @@ public class BocekItem extends GunItem { if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; + if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.idle")); var data = GunData.from(stack); if (data.reload.empty()) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java index d45d09868..2388f4511 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java @@ -21,12 +21,14 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.level.Level; import net.neoforged.neoforge.capabilities.Capabilities; import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.animation.*; +import software.bernie.geckolib.constant.DataTickets; import software.bernie.geckolib.renderer.GeoItemRenderer; import javax.annotation.ParametersAreNonnullByDefault; @@ -74,6 +76,8 @@ public class TaserItem extends GunItem implements EnergyStorageItem { if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; + if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.idle")); if (GunData.from(stack).reload.empty()) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload"));