kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复瞄准错位问题

Browse source
This commit is contained in:
17146 2024-12-21 00:39:21 +08:00
parent c2d4620b0b
commit 051ce0e14b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/atsuishio/superbwarfare/client/screens/JavelinHudOverlay.java
View file

@ -31,11 +31,11 @@ import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit;
@Mod.EventBusSubscriber(value = Dist.CLIENT) @Mod.EventBusSubscriber(value = Dist.CLIENT)
public class JavelinHudOverlay { public class JavelinHudOverlay {
private static final ResourceLocation FRAME = ModUtils.loc("textures/screens/javelin/frame.png"); private static final ResourceLocation FRAME = ModUtils.loc("textures/screens/javelin/frame.png");
private static final ResourceLocation FRAME_LOCK = ModUtils.loc("textures/screens/javelin/frame_lock.png"); private static final ResourceLocation FRAME_LOCK = ModUtils.loc("textures/screens/javelin/frame_lock.png");
private static float scopeScale = 1; private static float scopeScale = 1;
@SubscribeEvent(priority = EventPriority.LOWEST) @SubscribeEvent(priority = EventPriority.LOWEST)
public static void eventHandler(RenderGuiEvent.Pre event) { public static void eventHandler(RenderGuiEvent.Pre event) {
int w = event.getWindow().getGuiScaledWidth(); int w = event.getWindow().getGuiScaledWidth();
@ -49,7 +49,8 @@ public class JavelinHudOverlay {
if (player != null) { if (player != null) {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) return; if (player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit)
return;
if ((stack.getItem() == ModItems.JAVELIN.get() && !stack.getOrCreateTag().getBoolean("HoloHidden")) && Minecraft.getInstance().options.getCameraType().isFirstPerson() && ClientEventHandler.zoom) { if ((stack.getItem() == ModItems.JAVELIN.get() && !stack.getOrCreateTag().getBoolean("HoloHidden")) && Minecraft.getInstance().options.getCameraType().isFirstPerson() && ClientEventHandler.zoom) {
RenderSystem.disableDepthTest(); RenderSystem.disableDepthTest();
@ -90,19 +91,21 @@ public class JavelinHudOverlay {
if (seekingEntity == null) return; if (seekingEntity == null) return;
Vec3 p = RenderHelper.worldToScreen(new Vec3(seekingEntity.getX(), seekingEntity.getEyeY(),seekingEntity.getZ()), cameraPos); double zoom = 3;
Vec3 pos = new Vec3(seekingEntity.getX(), seekingEntity.getEyeY(), seekingEntity.getZ());
Vec3 lookAngle = player.getLookAngle().normalize().scale(pos.distanceTo(cameraPos) * (1 - 1.0 / zoom));
cameraPos = cameraPos.add(lookAngle);
Vec3 p = RenderHelper.worldToScreen(pos, cameraPos);
if (p == null) return; if (p == null) return;
boolean lockOn = stack.getOrCreateTag().getInt("SeekTime") > 20 && seekingEntity == targetEntity; boolean lockOn = stack.getOrCreateTag().getInt("SeekTime") > 20 && seekingEntity == targetEntity;
poseStack.pushPose(); poseStack.pushPose();
int x = (int) p.x; int x = (int) p.x;
int y = (int) p.y; int y = (int) p.y;
HudUtil.blit(poseStack, lockOn ? FRAME_LOCK : FRAME, x - 8, y - 8, 0, 0, 16, 16, 16, 16, 1f); HudUtil.blit(poseStack, lockOn ? FRAME_LOCK : FRAME, x - 8, y - 8, 0, 0, 16, 16, 16, 16, 1f);
poseStack.popPose(); poseStack.popPose();
} else { } else {
scopeScale = 1; scopeScale = 1;